Bring in the Psr\Container package

10up · Jul 26, 2023 · c43a017 · c43a017
1 parent 2977f56
commit c43a017
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 9 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,7 +7,6 @@
 /gulp-tasks export-ignore
 /lang export-ignore
 /tests export-ignore
-/vendor/ export-ignore
 /node_modules export-ignore
 
 /.babelrc export-ignore

diff --git a/.github/workflows/build-and-tag.yml b/.github/workflows/build-and-tag.yml
@@ -12,6 +12,15 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.0' # Minimum required version
+        coverage: none
+
+    - name: composer install
+      run: composer install --no-dev -o
+
     - name: install node v18
       uses: actions/setup-node@v3
       with:

diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
   ],
   "require": {
     "php": ">=7.0",
-    "composer/installers": "^1.0 || ^2.0"
+    "composer/installers": "^1.0 || ^2.0",
+    "psr/container": "^1.0 || ^2.0"
   },
   "require-dev": {
     "10up/phpcs-composer": "dev-master",

diff --git a/composer.lock b/composer.lock
diff --git a/elasticpress.php b/elasticpress.php
@@ -29,6 +29,11 @@
 	exit; // Exit if accessed directly.
 }
 
+// Require Composer autoloader if it exists.
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+	require_once __DIR__ . '/vendor/autoload.php';
+}
+
 define( 'EP_URL', plugin_dir_url( __FILE__ ) );
 define( 'EP_PATH', plugin_dir_path( __FILE__ ) );
 define( 'EP_FILE', plugin_basename( __FILE__ ) );

diff --git a/includes/classes/Container.php b/includes/classes/Container.php
@@ -9,12 +9,13 @@
 
 namespace ElasticPress;
 
+use \Psr\Container\ContainerInterface;
+use \Psr\Container\NotFoundExceptionInterface;
+
 /**
- * (semi-)PSR11 compliant container class
- *
- * Although type hinting will work, we do not implement the interfaces yet.
+ * PSR11 compliant container class
  */
-final class Container {
+final class Container implements ContainerInterface {
 	/**
 	 * Hold all instances
 	 *
@@ -27,13 +28,13 @@ final class Container {
 	 *
 	 * @param string $id Identifier of the entry to look for.
 	 *
-	 * @throws \Exception No entry was found for **this** identifier.
+	 * @throws NotFoundExceptionInterface No entry was found for **this** identifier.
 	 *
 	 * @return mixed Entry.
 	 */
 	public function get( string $id ) {
 		if ( ! isset( $this->instances[ $id ] ) ) {
-			throw new \Exception( 'Class not found' );
+			throw new NotFoundExceptionInterface( 'Class not found' );
 		}
 
 		return $this->instances[ $id ];