Skip to content

Commit 8c36cb5

Browse files
authored
Merge pull request #195 from alleyinteractive/0.12.x
0.12.x
2 parents 37f2b9b + b3514db commit 8c36cb5

File tree

17 files changed

+194
-112
lines changed

17 files changed

+194
-112
lines changed

.github/workflows/coding-standards.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ on:
44
push:
55
branches:
66
- main
7+
- '*.*.x'
78
pull_request:
89
schedule:
9-
- cron: '0 0 * * *'
10+
- cron: '0 0 * * 0'
1011

1112
jobs:
1213
coding-standards:
1314
uses: alleyinteractive/.github/.github/workflows/php-coding-standards.yml@main
15+
with:
16+
php: '8.2'

.github/workflows/node-tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Node Tests
22

33
on:
4+
push:
5+
branches:
6+
- main
7+
- '*.*.x'
48
pull_request:
59

610
jobs:

.github/workflows/tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ on:
44
push:
55
branches:
66
- main
7+
- '*.*.x'
78
pull_request:
89
schedule:
9-
- cron: '0 0 * * *'
10+
- cron: '0 0 * * 0'
1011

1112
jobs:
1213
php-tests:
1314
strategy:
1415
matrix:
15-
php: [8.0]
16+
php: [8.0, 8.1, 8.2]
1617
wordpress: ["latest"]
1718
multisite: [true, false]
1819
uses: alleyinteractive/.github/.github/workflows/php-tests.yml@main
1920
with:
21+
multisite: ${{ matrix.multisite }}
2022
php: ${{ matrix.php }}
2123
wordpress: ${{ matrix.wordpress }}
22-
multisite: ${{ matrix.multisite }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ and layout and leaving the rest of the functionality to be built within the
3030
Mantle plugin.
3131

3232
For more information about the framework and how to get started using it, check
33-
out the [Mantle Documentation Site](https://mantle.alley.co/).
33+
out the [Mantle Documentation Site](https://mantle.alley.com/).
3434

3535
## Installation
3636

@@ -57,13 +57,13 @@ You can also use a our
5757
[create-mantle-app](https://github.com/alleyinteractive/create-mantle-app)
5858
starter kit to get a fully scaffolded `wp-content`-rooted WordPress project out
5959
of the box. For more information, see
60-
[Installation](https://mantle.alley.co/getting-started/installation.html).
60+
[Installation](https://mantle.alley.com/getting-started/installation.html).
6161

6262
## Maintainers
6363

6464
This project is actively maintained by [Alley
6565
Interactive](https://github.com/alleyinteractive). Like what you see? [Come work
66-
with us](https://alley.co/careers/).
66+
with us](https://alley.com/careers/).
6767

6868
![Alley logo](https://avatars.githubusercontent.com/u/1733454?s=200&v=4)
6969

bin/mantle

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,27 @@ if ( file_exists( __DIR__ . '/../vendor/autoload.php' ) ) {
2121
exit( 1 );
2222
}
2323

24-
$app = require_once __DIR__ . '/../bootstrap/app.php';
25-
2624
/*
2725
|--------------------------------------------------------------------------
28-
| Run the Console Mantle Application
26+
| Load the Application
2927
|--------------------------------------------------------------------------
3028
|
31-
| Load the Mantle application and run the console application. With isolation
32-
| mode enabled, we shouldn't have a dependency on WordPress.
29+
| Load the Mantle application from the bootstrap file.
3330
|
3431
*/
3532

36-
$kernel = $app->make( Mantle\Contracts\Console\Kernel::class );
37-
38-
$status = $kernel->handle(
39-
$input = new Symfony\Component\Console\Input\ArgvInput,
40-
new Symfony\Component\Console\Output\ConsoleOutput(),
41-
);
33+
$app = require_once MANTLE_BASE_DIR . '/bootstrap/app.php';
4234

4335
/*
4436
|--------------------------------------------------------------------------
45-
| Shutdown The Application
37+
| Run the Mantle Console Application
4638
|--------------------------------------------------------------------------
4739
|
48-
| Once the application has finished running, we will fire off the shutdown
49-
| events so that any final work may be done by the application before it
50-
| is shut down gracefully.
40+
| Load the application with the base configuration and boot it. Booting it will
41+
| cause the console application to run and exit with the status code.
5142
|
5243
*/
5344

54-
$kernel->terminate( $input, $status );
55-
56-
exit( $status );
45+
bootloader( $app )
46+
->set_base_path( MANTLE_BASE_DIR )
47+
->boot();

composer.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
],
1212
"require": {
1313
"alleyinteractive/composer-wordpress-autoloader": "^1.0",
14-
"alleyinteractive/mantle-framework": "^0.11",
15-
"fakerphp/faker": "^1.9"
14+
"alleyinteractive/mantle-framework": "^0.12",
15+
"fakerphp/faker": "^1.23"
1616
},
1717
"require-dev": {
1818
"alleyinteractive/alley-coding-standards": "^1.0",
19-
"nunomaduro/collision": "^5.0",
20-
"phpunit/phpunit": "^9.3.3"
19+
"nunomaduro/collision": "^6.4",
20+
"phpunit/phpunit": "^9.6.10",
21+
"wp-coding-standards/wpcs": "dev-php-8-1 as 2.3.x-dev"
2122
},
2223
"config": {
2324
"allow-plugins": {
@@ -41,6 +42,12 @@
4142
},
4243
"minimum-stability": "dev",
4344
"prefer-stable": true,
45+
"repositories": [
46+
{
47+
"type": "vcs",
48+
"url": "https://github.com/alleyinteractive/WordPress-Coding-Standards"
49+
}
50+
],
4451
"scripts": {
4552
"post-autoload-dump": [
4653
"bin/mantle package:discover",

config/app.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,15 @@
7777
|
7878
*/
7979
'namespace' => environment( 'APP_NAMESPACE', 'App' ),
80+
81+
/*
82+
|--------------------------------------------------------------------------
83+
| Application Text Domain
84+
|--------------------------------------------------------------------------
85+
|
86+
| The text domain used by Mantle when scaffolding files with translatable
87+
| strings.
88+
|
89+
*/
90+
'i18n_domain' => environment( 'APP_I18N_DOMAIN', 'mantle' ),
8091
];

config/assets.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
*/
2828
'url' => env(
2929
'ASSET_BUILD_URL',
30-
function_exists( 'plugin_dir_url' ) ? \plugin_dir_url( __DIR__ ) . 'build' : '', // todo: replace with a framework helper method.
30+
function_exists( 'plugin_dir_url' ) ? \plugin_dir_url( __DIR__ ) . 'build' : '',
3131
),
3232
];

database/factories/.gitkeep

Whitespace-only changes.

database/factories/category-factory.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)