Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions _patches/stellarwp-shepherd-correct-container-typehint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/Config.php
+++ b/src/Config.php
@@ -10,7 +10,7 @@
namespace StellarWP\Shepherd;

use StellarWP\Shepherd\Config\Container;
-use StellarWP\ContainerContract\ContainerInterface;
+use TEC\Common\StellarWP\ContainerContract\ContainerInterface;
use TypeError;

class Config {
12 changes: 12 additions & 0 deletions _patches/stellarwp-shepherd-remove-files-autoload.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,5 @@
"psr-4": {
"StellarWP\\Shepherd\\": "src/"
}
- },
- "files": [
- "src/functions.php"
- ]
+ }
}
6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"stellarwp/installer": "^1.1.0",
"stellarwp/models": "dev-main",
"stellarwp/schema": "2.0.1",
"stellarwp/shepherd": "dev-temp-no-namespace-files",
"stellarwp/shepherd": "dev-fix/php-74-standalone",
"stellarwp/telemetry": "^2.3.4",
"stellarwp/uplink": "2.2.2"
},
Expand Down Expand Up @@ -159,6 +159,10 @@
"patches": {
"fakerphp/faker": {
"Use prefixed Psr\\Container\\ContainerInterface": "tests/_patches/faker-use-prefixed-containerinterface.patch"
},
"stellarwp/shepherd": {
"Remove files autoload": "common/_patches/stellarwp-shepherd-remove-files-autoload.patch",
"Correct Container type-hint": "_patches/stellarwp-shepherd-correct-container-typehint.patch"
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/Tribe/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ public function __construct( $context = null ) {

$vendor_folder = dirname( dirname( dirname( __FILE__ ) ) ) . '/vendor/';
require_once realpath( $vendor_folder . 'vendor-prefixed/autoload.php' );
// Manually require the prefixed functions.php file.
require_once realpath( $vendor_folder . '/vendor-prefixed/stellarwp/shepherd/src/functions.php' );

require_once realpath( $vendor_folder . 'autoload.php' );

// The DI container class.
Expand Down
Loading