update dependencies and remove WpFacade.php

Author: calvinalkan

WpFacade.php

@@ -1,22 +1,29 @@
 <?php
+
+
+    declare(strict_types = 1);
+
+
+    namespace WpFacade;
 
-	namespace WpFacade;
-	
+	use Contracts\ContainerAdapter;
+	use Mockery;
 	use Mockery\MockInterface;
+	use RuntimeException;
 
 	abstract class WpFacade {
-		/** @var \BetterWpHooks\Contracts\EventContainerAdapter */
-		private static $container;
-		
 
+
+	    /** @var ContainerAdapter */
+		private static $container;
+
 		/**
 		 * The resolved object instances.
 		 *
 		 * @var array
 		 */
 		private static $resolvedInstance;
-		
-		
+
 		/**
 		 * Get the root object behind the facade.
 		 *
@@ -26,8 +33,7 @@ public static function getFacadeRoot() {
 
 			return static::resolveFacadeInstance(  static::getFacadeAccessor() );
 		}
-		
-		
+
 		/**
 		 * Get the registered name of the component.
 		 *
@@ -39,9 +45,7 @@ protected static function getFacadeAccessor() {
 
 			throw new RuntimeException( 'Facade does not implement getFacadeAccessor method.' );
 		}
-		
-		
-		
+
 		/**
 		 * Resolve the facade root instance from the container.
 		 *
@@ -75,7 +79,7 @@ protected static function resolveFacadeInstance( $name ) {
 		 *
 		 * @return void
 		 */
-		public static function clearResolvedInstance( $name ) {
+		public static function clearResolvedInstance( string $name ) {
 			unset( static::$resolvedInstance[ $name ] );
 		}
 
@@ -91,24 +95,15 @@ public static function clearResolvedInstances() {
 		}
 
 
-		/**
-		 *
-		 * @return \BetterWpHooks\Contracts\EventContainerAdapter
-		 */
-		public static function getFacadeContainer(): Contracts\EventContainerAdapter {
+		public static function getFacadeContainer(): ContainerAdapter {
 
 			return static::$container;
 
 		}
 
-		/**
-		 * Set the application instance.
-		 *
-		 * @param  \BetterWpHooks\Contracts\EventContainerAdapter $container
-		 *
-		 * @return void
-		 */
-		public static function setFacadeContainer( $container ) {
+		
+
+		public static function setFacadeContainer( ContainerAdapter $container ) {
 			static::$container = $container;
 		}
 
@@ -121,7 +116,7 @@ public static function setFacadeContainer( $container ) {
 		 *
 		 * @return mixed
 		 *
-		 * @throws \RuntimeException
+		 * @throws RuntimeException
 		 */
 		public static function __callStatic( string $method, array $args ) {
 
@@ -135,8 +130,7 @@ public static function __callStatic( string $method, array $args ) {
 			return $instance->$method( ...$args );
 
 		}
-		
-		
+
 		/**
 		 * Convert the facade into a Mockery spy.
 		 *
@@ -147,14 +141,15 @@ public static function spy() {
 			if ( ! static::isMock() ) {
 
 				$class = static::getMockableClass();
-				
-				return tap( $class ? Mockery::spy( $class ) : Mockery::spy(), function ( $spy ) {
-					static::swap( $spy );
-				} );
+
+				$spy = $class ? Mockery::spy($class) : Mockery::spy();
+                static::swap($spy);
+
+				return $spy;
+
 			}
 		}
-		
-		
+
 		/**
 		 * Initiate a partial mock on the facade.
 		 *
@@ -192,11 +187,14 @@ public static function shouldReceive() {
 		 * @return \Mockery\MockInterface
 		 */
 		protected static function createFreshMockInstance() {
-			return tap( static::createMock(), function ( $mock ) {
-				static::swap( $mock );
-				
-				$mock->shouldAllowMockingProtectedMethods();
-			} );
+
+		    $mock = static::createMock();
+		    static::swap($mock);
+		    $mock->shouldAllowMockingProtectedMethods();
+
+		    return $mock;
+
+
 		}
 
 		/**
@@ -216,6 +214,7 @@ protected static function createMock() {
 		 * @return bool
 		 */
 		protected static function isMock() {
+
 			$name = static::getFacadeAccessor();
 
 			return isset( static::$resolvedInstance[ $name ] ) &&

composer.json

@@ -4,7 +4,12 @@
   "homepage": "https://github.com/calvinalkan/base-container/",
 
   "require": {
-    "calvinalkan/interfaces": "0.1.0"
+    "php": "^7.3",
+    "calvinalkan/interfaces": "0.1.1"
+  },
+
+  "require-dev": {
+    "mockery/mockery": "^1.4"
   },
 
   "license": "GPL-2.0-or-later",
@@ -15,6 +20,12 @@
     }
 
   ],
+
+  "suggest": {
+    "mockery/mockery": "Required if you want to use the Facade Fake Replacement for testing purposes"
+
+  },
+
   "autoload": {
     "psr-4": {
       "WpFacade\\": "/"