Skip to content

Commit

Permalink
Merge pull request #306 from alleyinteractive/composer-loader-injection
Browse files Browse the repository at this point in the history
Switching to new composer autoloader
  • Loading branch information
srtfisher committed Jul 30, 2022
2 parents c908cd9 + f3e51b4 commit 5386b54
Show file tree
Hide file tree
Showing 26 changed files with 26 additions and 28 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
],
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"alleyinteractive/wp-asset-manager": "^1.0",
"alleyinteractive/wp-concurrent-remote-requests": "^0.1.0",
"alleyinteractive/wp-concurrent-remote-requests": "^1.0.0",
"dragonmantank/cron-expression": "^3.1",
"fakerphp/faker": "^1.16",
"filp/whoops": "^2.14",
Expand Down
2 changes: 1 addition & 1 deletion monorepo-builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
Option::DATA_TO_APPEND,
[
ComposerJsonSection::REQUIRE => [
'alleyinteractive/composer-wordpress-autoloader' => '^0.4',
'alleyinteractive/composer-wordpress-autoloader' => '^0.6',
'php' => '^7.4|^8.0',
],
ComposerJsonSection::REQUIRE_DEV => [
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/assets/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"alleyinteractive/wp-asset-manager": "^1.0",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5"
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/auth/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/http": "^0.5",
"symfony/http-kernel": "^5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/cache/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5",
"nesbot/carbon": "^2.53"
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/caper/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4"
"alleyinteractive/composer-wordpress-autoloader": "^0.6"
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5"
},
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5",
"nette/php-generator": "^3.6",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/container/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"psr/container": "^1.1.1 || ^2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/contracts/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"psr/container": "^1.1.1 || ^2.0.1"
},
"provide": {
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/database/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5",
"psr/container": "^1.1.1 || ^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/events/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/container": "^0.5",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/facade/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5"
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/faker/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"fakerphp/faker": "^1.16"
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/filesystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"league/flysystem": "^1.1",
"league/flysystem-cached-adapter": "^1.1",
"mantle-framework/contracts": "^0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/http-client/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/wp-concurrent-remote-requests": "^0.1.0",
"alleyinteractive/wp-concurrent-remote-requests": "^1.0.0",
"mantle-framework/support": "^0.5"
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/log/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/support": "^0.5",
"monolog/monolog": "^2.7",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/query-monitor/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/database": "^0.5",
"mantle-framework/http": "^0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/queue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/console": "^0.5",
"mantle-framework/support": "^0.5"
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/rest-api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5"
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/scheduling/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"dragonmantank/cron-expression": "^3.1",
"guzzlehttp/guzzle": "^6.3.1 || ^7.3",
"mantle-framework/contracts": "^0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/support/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"monolog/monolog": "^2.7",
"nesbot/carbon": "^2.53",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/testing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5",
"mantle-framework/database": "^0.5",
"mantle-framework/http-client": "^0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/testkit/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/config": "^0.5",
"mantle-framework/container": "^0.5",
"mantle-framework/contracts": "^0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/mantle/view/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"require": {
"php": "^7.4|^8.0",
"alleyinteractive/composer-wordpress-autoloader": "^0.4",
"alleyinteractive/composer-wordpress-autoloader": "^0.6",
"mantle-framework/contracts": "^0.5"
},
"extra": {
Expand Down
2 changes: 0 additions & 2 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

namespace Mantle\Tests;

require_once __DIR__ . '/../vendor/wordpress-autoload.php';

defined( 'MULTISITE' ) || define( 'MULTISITE', true );
define( 'MANTLE_PHPUNIT_INCLUDES_PATH', __DIR__ . '/includes' );
define( 'MANTLE_PHPUNIT_TEMPLATE_PATH', __DIR__ . '/template-parts' );
Expand Down

0 comments on commit 5386b54

Please sign in to comment.