update base-container dependency to a tagged release instead of dev-m…

…aster
calvinalkan · Apr 21, 2021 · be4c346 · be4c346
1 parent cc690e9
commit be4c346
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 47 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   "require": {
     "php": "^7.3",
     "illuminate/support": "8.35.1",
-    "calvinalkan/base-container": "0.1.1"
+    "calvinalkan/base-container": "0.1.3"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/BetterWpHooks.php b/src/BetterWpHooks.php
@@ -6,14 +6,14 @@
 	use BetterWpHooks\Contracts\Dispatcher;
 	use BetterWpHooks\Exceptions\ConfigurationException;
 	use BetterWpHooks\Mappers\WordpressEventMapper;
-	use Contracts\SniccoContainerAdapter;
+	use Contracts\ContainerAdapter ;
 	use Illuminate\Support\Arr;
 
 	class BetterWpHooks {
 
 
 		/**
-		 * @var SniccoContainerAdapter
+		 * @var ContainerAdapter
 		 */
 		private $container_adapter;
 
@@ -30,7 +30,7 @@ class BetterWpHooks {
 		private $listen = [];
 		private $mapped_events = [];
 
-		public function __construct(  SniccoContainerAdapter $container_adapter,  Dispatcher $dispatcher,
+		public function __construct(  ContainerAdapter $container_adapter,  Dispatcher $dispatcher,
 			EventMapper $event_mapper ) {
 
 			$this->container_adapter = $container_adapter;
@@ -64,7 +64,7 @@ public function boot() {
 
 		}
 
-		public function container(): SniccoContainerAdapter {
+		public function container(): ContainerAdapter {
 
 			return $this->container_adapter;
 

diff --git a/src/ListenerFactory.php b/src/ListenerFactory.php
@@ -7,11 +7,12 @@
 	use BetterWpHooks\Exceptions\InvalidListenerException;
 	use BetterWpHooks\Exceptions\ExecutionErrorHandler;
 	use BetterWpHooks\Listeners\ClassListener;
+
 	use BetterWpHooks\Listeners\ClosureListener;
 	use BetterWpHooks\Listeners\InstanceListener;
 	use BetterWpHooks\Traits\ReflectsCallable;
 	use Closure;
-	use Contracts\SniccoContainerAdapter;
+	use Contracts\ContainerAdapter;
 	use Illuminate\Support\Arr;
 	use Illuminate\Support\Reflector;
 	use Illuminate\Support\Str;
@@ -34,7 +35,7 @@ class ListenerFactory {
 		private $error_handler;
 
 
-		public function __construct( SniccoContainerAdapter $container = NULL, ErrorHandler $error_handler = NULL ) {
+		public function __construct( ContainerAdapter $container = NULL, ErrorHandler $error_handler = NULL ) {
 
 			$this->container = $container ?? new BaseContainerAdapter();
 
@@ -120,9 +121,7 @@ private function wrap( AbstractListener $listener ): Closure {
 					$this->error_handler->handle($e);
 
 				}
-
-
-
+
 
 			};
 

diff --git a/src/Listeners/ClassListener.php b/src/Listeners/ClassListener.php
@@ -4,7 +4,7 @@
 
 	use BetterWpHooks\Contracts\AbstractListener;
 	use BetterWpHooks\Traits\ReflectsCallable;
-	use Contracts\SniccoContainerAdapter;
+	use Contracts\ContainerAdapter;
 
 	use function BetterWpHooks\Functions\normalizeClassMethod;
 
@@ -18,11 +18,11 @@ class ClassListener extends AbstractListener {
 		private $class_callable;
 
 		/**
-		 * @var \Contracts\SniccoContainerAdapter
+		 * @var \Contracts\ContainerAdapter
 		 */
 		private $container;
 
-		public function __construct( array $listener, SniccoContainerAdapter $container ) {
+		public function __construct( array $listener, ContainerAdapter $container ) {
 
 			$this->class_callable = array_values( $listener );
 			$this->container      = $container;

diff --git a/src/Listeners/ClosureListener.php b/src/Listeners/ClosureListener.php
@@ -4,7 +4,7 @@
 
 	use BetterWpHooks\Contracts\AbstractListener;
 	use BetterWpHooks\Traits\ReflectsCallable;
-	use Contracts\SniccoContainerAdapter;
+	use Contracts\ContainerAdapter;
 
 	class ClosureListener extends AbstractListener {
 
@@ -16,11 +16,11 @@ class ClosureListener extends AbstractListener {
 		private  $closure;
 
 		/**
-		 * @var \Contracts\SniccoContainerAdapter
+		 * @var \Contracts\ContainerAdapter
 		 */
 		private  $container;
 
-		public function __construct( \Closure $closure, SniccoContainerAdapter $container) {
+		public function __construct( \Closure $closure, ContainerAdapter $container) {
 
 			$this->closure = $closure;
 			$this->container = $container;

diff --git a/src/Listeners/InstanceListener.php b/src/Listeners/InstanceListener.php
@@ -4,7 +4,7 @@
 
 	use BetterWpHooks\Contracts\AbstractListener;
 	use BetterWpHooks\Traits\ReflectsCallable;
-	use Contracts\SniccoContainerAdapter;
+	use Contracts\ContainerAdapter;
 
 	class InstanceListener extends AbstractListener {
 
@@ -16,11 +16,11 @@ class InstanceListener extends AbstractListener {
 		private $instance;
 
 		/**
-		 * @var \Contracts\SniccoContainerAdapter
+		 * @var \Contracts\ContainerAdapter
 		 */
 		private $container;
 
-		public function __construct( array $instance, SniccoContainerAdapter $container ) {
+		public function __construct( array $instance, ContainerAdapter $container ) {
 
 			$this->instance  = array_values( $instance );
 			$this->container = $container;

diff --git a/src/Traits/BetterWpHooksFacade.php b/src/Traits/BetterWpHooksFacade.php
@@ -10,7 +10,7 @@
     use BetterWpHooks\Mappers\WordpressEventMapper;
     use BetterWpHooks\Testing\FakeDispatcher;
     use BetterWpHooks\WordpressApi;
-    use Contracts\SniccoContainerAdapter;
+    use Contracts\ContainerAdapter;
     use SniccoAdapter\BaseContainerAdapter;
 
     use function BetterWpHooks\Functions\hasTrait;
@@ -30,7 +30,7 @@ trait BetterWpHooksFacade
          */
         public static $instance = NULL;
 
-        public static function make ( SniccoContainerAdapter $container_adapter = NULL ) : ?BetterWpHooks
+        public static function make ( ContainerAdapter $container_adapter = NULL ) : ?BetterWpHooks
         {
 
 
@@ -225,7 +225,7 @@ public static function fake ( $eventsToFake = [] ) : FakeDispatcher
         }
 
 
-        private static function createInstance ( SniccoContainerAdapter $container_adapter = NULL ) : BetterWpHooks
+        private static function createInstance ( ContainerAdapter $container_adapter = NULL ) : BetterWpHooks
         {
 
             $container_adapter = $container_adapter ?? new BaseContainerAdapter();

diff --git a/src/functions.php b/src/functions.php
@@ -55,8 +55,7 @@ function splitAtSign( string $string ) {
 			function isClosure( $object ): bool {
 
 				return $object instanceof Closure;
-
-
+
 			}
 
 

diff --git a/tests/TestStubs/DifferentContainer.php b/tests/TestStubs/DifferentContainer.php
@@ -2,9 +2,10 @@
 
 	namespace Tests\TestStubs;
 
-	use Contracts\SniccoContainerAdapter;
+	use Closure;
+    use Contracts\ContainerAdapter;
 
-	class DifferentContainer implements SniccoContainerAdapter {
+	class DifferentContainer implements ContainerAdapter {
 
 		/**
 		 * @param  mixed  $offset
@@ -78,5 +79,15 @@ public function instance( $abstract, $instance ) {
 		public function call( $callable, array $parameters = [] ) {
 
 		}
-
-	}
+
+        public function bind($abstract, $concrete)
+        {
+            // TODO: Implement bind() method.
+        }
+
+        public function singleton($abstract, $concrete)
+        {
+            // TODO: Implement singleton() method.
+        }
+
+    }