pryley / castor-framework

src/Container.php

Indentation +221 added lines, -221 removed lines

@@ -9,225 +9,225 @@
 
 abstract class Container
 {
-    /**
-     * The current globally available container (if any).
-     *
-     * @var static
-     */
-    protected static $instance;
-
-    /**
-     * The container's bound services.
-     *
-     * @var array
-     */
-    protected $services = [];
-
-    /**
-     * The container's bucket items.
-     *
-     * @var array
-     */
-    protected $bucket = [];
-
-    /**
-     * Set the globally available instance of the container.
-     *
-     * @return static
-     */
-    public static function getInstance()
-    {
-        if (is_null(static::$instance)) {
-            static::$instance = new static();
-        }
-
-        return static::$instance;
-    }
-
-    /**
-     * Bind a service to the container.
-     *
-     * @param string $alias
-     * @param mixed  $concrete
-     *
-     * @return mixed
-     */
-    public function bind($alias, $concrete)
-    {
-        $this->services[$alias] = $concrete;
-    }
-
-    /**
-     * Resolve the given type from the container.
-     * Allow unbound aliases that omit the root namespace
-     * i.e. 'Controller' translates to 'GeminiLabs\Castor\Controller'.
-     *
-     * @param mixed $abstract
-     *
-     * @return mixed
-     */
-    public function make($abstract)
-    {
-        $service = isset($this->services[$abstract])
-            ? $this->services[$abstract]
-            : $this->addNamespace($abstract);
-
-        if (is_callable($service)) {
-            return call_user_func_array($service, [$this]);
-        }
-        if (is_object($service)) {
-            return $service;
-        }
-
-        return $this->resolve($service);
-    }
-
-    /**
-     * Register a shared binding in the container.
-     *
-     * @param string               $abstract
-     * @param \Closure|string|null $concrete
-     *
-     * @return void
-     */
-    public function singleton($abstract, $concrete)
-    {
-        $this->bind($abstract, $this->make($concrete));
-    }
-
-    /**
-     * Dynamically access container bucket items.
-     *
-     * @param string $item
-     *
-     * @return mixed
-     */
-    public function __get($item)
-    {
-        return isset($this->bucket[$item])
-            ? $this->bucket[$item]
-            : null;
-    }
-
-    /**
-     * Dynamically set container bucket items.
-     *
-     * @param string $item
-     * @param mixed  $value
-     *
-     * @return void
-     */
-    public function __set($item, $value)
-    {
-        $this->bucket[$item] = $value;
-    }
-
-    /**
-     * Prefix the current namespace to the abstract if absent.
-     *
-     * @param string $abstract
-     *
-     * @return string
-     */
-    protected function addNamespace($abstract)
-    {
-        if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
-            $abstract = __NAMESPACE__."\\$abstract";
-        }
-
-        return $abstract;
-    }
-
-    /**
-     * @param \ReflectionParameter $parameter
-     * @return null|\ReflectionClass|\ReflectionNamedType|\ReflectionType
-     */
-    protected function getClass($parameter)
-    {
-        if (version_compare(phpversion(), '8', '<')) {
-            return $parameter->getClass(); // @compat PHP < 8
-        }
-        return $parameter->getType();
-    }
-
-    /**
-     * Throw an exception that the concrete is not instantiable.
-     *
-     * @param string $concrete
-     *
-     * @return void
-     * @throws BindingResolutionException
-     */
-    protected function notInstantiable($concrete)
-    {
-        $message = "Target [$concrete] is not instantiable.";
-
-        throw new BindingResolutionException($message);
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     *
-     * @param mixed $concrete
-     *
-     * @return mixed
-     * @throws BindingResolutionException
-     */
-    protected function resolve($concrete)
-    {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
-        }
-
-        $reflector = new ReflectionClass($concrete);
-
-        if (!$reflector->isInstantiable()) {
-            return $this->notInstantiable($concrete);
-        }
-
-        if (is_null(($constructor = $reflector->getConstructor()))) {
-            return new $concrete();
-        }
-
-        return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
-        );
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     *
-     * @return mixed
-     * @throws BindingResolutionException
-     */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
-        try {
-            return $this->make($this->getClass($parameter)->getName());
-        } catch (BindingResolutionException $e) {
-            if ($parameter->isOptional()) {
-                return $parameter->getDefaultValue();
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Resolve all of the dependencies from the ReflectionParameters.
-     *
-     * @return array
-     */
-    protected function resolveDependencies(array $dependencies)
-    {
-        $results = [];
-
-        foreach ($dependencies as $dependency) {
-            // If the class is null, the dependency is a string or some other primitive type
-            $results[] = !is_null($class = $this->getClass($dependency))
-                ? $this->resolveClass($dependency)
-                : null;
-        }
-
-        return $results;
-    }
+	/**
+	 * The current globally available container (if any).
+	 *
+	 * @var static
+	 */
+	protected static $instance;
+
+	/**
+	 * The container's bound services.
+	 *
+	 * @var array
+	 */
+	protected $services = [];
+
+	/**
+	 * The container's bucket items.
+	 *
+	 * @var array
+	 */
+	protected $bucket = [];
+
+	/**
+	 * Set the globally available instance of the container.
+	 *
+	 * @return static
+	 */
+	public static function getInstance()
+	{
+		if (is_null(static::$instance)) {
+			static::$instance = new static();
+		}
+
+		return static::$instance;
+	}
+
+	/**
+	 * Bind a service to the container.
+	 *
+	 * @param string $alias
+	 * @param mixed  $concrete
+	 *
+	 * @return mixed
+	 */
+	public function bind($alias, $concrete)
+	{
+		$this->services[$alias] = $concrete;
+	}
+
+	/**
+	 * Resolve the given type from the container.
+	 * Allow unbound aliases that omit the root namespace
+	 * i.e. 'Controller' translates to 'GeminiLabs\Castor\Controller'.
+	 *
+	 * @param mixed $abstract
+	 *
+	 * @return mixed
+	 */
+	public function make($abstract)
+	{
+		$service = isset($this->services[$abstract])
+			? $this->services[$abstract]
+			: $this->addNamespace($abstract);
+
+		if (is_callable($service)) {
+			return call_user_func_array($service, [$this]);
+		}
+		if (is_object($service)) {
+			return $service;
+		}
+
+		return $this->resolve($service);
+	}
+
+	/**
+	 * Register a shared binding in the container.
+	 *
+	 * @param string               $abstract
+	 * @param \Closure|string|null $concrete
+	 *
+	 * @return void
+	 */
+	public function singleton($abstract, $concrete)
+	{
+		$this->bind($abstract, $this->make($concrete));
+	}
+
+	/**
+	 * Dynamically access container bucket items.
+	 *
+	 * @param string $item
+	 *
+	 * @return mixed
+	 */
+	public function __get($item)
+	{
+		return isset($this->bucket[$item])
+			? $this->bucket[$item]
+			: null;
+	}
+
+	/**
+	 * Dynamically set container bucket items.
+	 *
+	 * @param string $item
+	 * @param mixed  $value
+	 *
+	 * @return void
+	 */
+	public function __set($item, $value)
+	{
+		$this->bucket[$item] = $value;
+	}
+
+	/**
+	 * Prefix the current namespace to the abstract if absent.
+	 *
+	 * @param string $abstract
+	 *
+	 * @return string
+	 */
+	protected function addNamespace($abstract)
+	{
+		if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+			$abstract = __NAMESPACE__."\\$abstract";
+		}
+
+		return $abstract;
+	}
+
+	/**
+	 * @param \ReflectionParameter $parameter
+	 * @return null|\ReflectionClass|\ReflectionNamedType|\ReflectionType
+	 */
+	protected function getClass($parameter)
+	{
+		if (version_compare(phpversion(), '8', '<')) {
+			return $parameter->getClass(); // @compat PHP < 8
+		}
+		return $parameter->getType();
+	}
+
+	/**
+	 * Throw an exception that the concrete is not instantiable.
+	 *
+	 * @param string $concrete
+	 *
+	 * @return void
+	 * @throws BindingResolutionException
+	 */
+	protected function notInstantiable($concrete)
+	{
+		$message = "Target [$concrete] is not instantiable.";
+
+		throw new BindingResolutionException($message);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 *
+	 * @param mixed $concrete
+	 *
+	 * @return mixed
+	 * @throws BindingResolutionException
+	 */
+	protected function resolve($concrete)
+	{
+		if ($concrete instanceof Closure) {
+			return $concrete($this);
+		}
+
+		$reflector = new ReflectionClass($concrete);
+
+		if (!$reflector->isInstantiable()) {
+			return $this->notInstantiable($concrete);
+		}
+
+		if (is_null(($constructor = $reflector->getConstructor()))) {
+			return new $concrete();
+		}
+
+		return $reflector->newInstanceArgs(
+			$this->resolveDependencies($constructor->getParameters())
+		);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 *
+	 * @return mixed
+	 * @throws BindingResolutionException
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try {
+			return $this->make($this->getClass($parameter)->getName());
+		} catch (BindingResolutionException $e) {
+			if ($parameter->isOptional()) {
+				return $parameter->getDefaultValue();
+			}
+			throw $e;
+		}
+	}
+
+	/**
+	 * Resolve all of the dependencies from the ReflectionParameters.
+	 *
+	 * @return array
+	 */
+	protected function resolveDependencies(array $dependencies)
+	{
+		$results = [];
+
+		foreach ($dependencies as $dependency) {
+			// If the class is null, the dependency is a string or some other primitive type
+			$results[] = !is_null($class = $this->getClass($dependency))
+				? $this->resolveClass($dependency)
+				: null;
+		}
+
+		return $results;
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -37,7 +37,7 @@ 
      */
     public static function getInstance()
     {
-        if (is_null(static::$instance)) {
+        if( is_null( static::$instance ) ) {
             static::$instance = new static();
         }
 
@@ -52,7 +52,7 @@ 
      *
      * @return mixed
      */
-    public function bind($alias, $concrete)
+    public function bind( $alias, $concrete )
     {
         $this->services[$alias] = $concrete;
     }
@@ -66,20 +66,20 @@ 
      *
      * @return mixed
      */
-    public function make($abstract)
+    public function make( $abstract )
     {
-        $service = isset($this->services[$abstract])
+        $service = isset( $this->services[$abstract] )
             ? $this->services[$abstract]
-            : $this->addNamespace($abstract);
+            : $this->addNamespace( $abstract );
 
-        if (is_callable($service)) {
-            return call_user_func_array($service, [$this]);
+        if( is_callable( $service ) ) {
+            return call_user_func_array( $service, [$this] );
         }
-        if (is_object($service)) {
+        if( is_object( $service ) ) {
             return $service;
         }
 
-        return $this->resolve($service);
+        return $this->resolve( $service );
     }
 
     /**
@@ -90,9 +90,9 @@ 
      *
      * @return void
      */
-    public function singleton($abstract, $concrete)
+    public function singleton( $abstract, $concrete )
     {
-        $this->bind($abstract, $this->make($concrete));
+        $this->bind( $abstract, $this->make( $concrete ) );
     }
 
     /**
@@ -102,9 +102,9 @@ 
      *
      * @return mixed
      */
-    public function __get($item)
+    public function __get( $item )
     {
-        return isset($this->bucket[$item])
+        return isset( $this->bucket[$item] )
             ? $this->bucket[$item]
             : null;
     }
@@ -117,7 +117,7 @@ 
      *
      * @return void
      */
-    public function __set($item, $value)
+    public function __set( $item, $value )
     {
         $this->bucket[$item] = $value;
     }
@@ -129,9 +129,9 @@ 
      *
      * @return string
      */
-    protected function addNamespace($abstract)
+    protected function addNamespace( $abstract )
     {
-        if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+        if( false === strpos( $abstract, __NAMESPACE__ ) && !class_exists( $abstract ) ) {
             $abstract = __NAMESPACE__."\\$abstract";
         }
 
@@ -142,9 +142,9 @@ 
      * @param \ReflectionParameter $parameter
      * @return null|\ReflectionClass|\ReflectionNamedType|\ReflectionType
      */
-    protected function getClass($parameter)
+    protected function getClass( $parameter )
     {
-        if (version_compare(phpversion(), '8', '<')) {
+        if( version_compare( phpversion(), '8', '<' ) ) {
             return $parameter->getClass(); // @compat PHP < 8
         }
         return $parameter->getType();
@@ -158,11 +158,11 @@ 
      * @return void
      * @throws BindingResolutionException
      */
-    protected function notInstantiable($concrete)
+    protected function notInstantiable( $concrete )
     {
         $message = "Target [$concrete] is not instantiable.";
 
-        throw new BindingResolutionException($message);
+        throw new BindingResolutionException( $message );
     }
 
     /**
@@ -173,24 +173,24 @@ 
      * @return mixed
      * @throws BindingResolutionException
      */
-    protected function resolve($concrete)
+    protected function resolve( $concrete )
     {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
+        if( $concrete instanceof Closure ) {
+            return $concrete( $this );
         }
 
-        $reflector = new ReflectionClass($concrete);
+        $reflector = new ReflectionClass( $concrete );
 
-        if (!$reflector->isInstantiable()) {
-            return $this->notInstantiable($concrete);
+        if( !$reflector->isInstantiable() ) {
+            return $this->notInstantiable( $concrete );
         }
 
-        if (is_null(($constructor = $reflector->getConstructor()))) {
+        if( is_null( ( $constructor = $reflector->getConstructor() ) ) ) {
             return new $concrete();
         }
 
         return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
+            $this->resolveDependencies( $constructor->getParameters() )
         );
     }
 
@@ -200,12 +200,12 @@ 
      * @return mixed
      * @throws BindingResolutionException
      */
-    protected function resolveClass(ReflectionParameter $parameter)
+    protected function resolveClass( ReflectionParameter $parameter )
     {
         try {
-            return $this->make($this->getClass($parameter)->getName());
-        } catch (BindingResolutionException $e) {
-            if ($parameter->isOptional()) {
+            return $this->make( $this->getClass( $parameter )->getName() );
+        } catch( BindingResolutionException $e ) {
+            if( $parameter->isOptional() ) {
                 return $parameter->getDefaultValue();
             }
             throw $e;
@@ -217,14 +217,14 @@ 
      *
      * @return array
      */
-    protected function resolveDependencies(array $dependencies)
+    protected function resolveDependencies( array $dependencies )
     {
         $results = [];
 
-        foreach ($dependencies as $dependency) {
+        foreach( $dependencies as $dependency ) {
             // If the class is null, the dependency is a string or some other primitive type
-            $results[] = !is_null($class = $this->getClass($dependency))
-                ? $this->resolveClass($dependency)
+            $results[] = !is_null( $class = $this->getClass( $dependency ) )
+                ? $this->resolveClass( $dependency )
                 : null;
         }
 

Braces +3 added lines, -3 removed lines

@@ -7,8 +7,7 @@ 
 use ReflectionClass;
 use ReflectionParameter;
 
-abstract class Container
-{
+abstract class Container {
     /**
      * The current globally available container (if any).
      *
@@ -204,7 +203,8 @@ 
     {
         try {
             return $this->make($this->getClass($parameter)->getName());
-        } catch (BindingResolutionException $e) {
+        }
+        catch (BindingResolutionException $e) {
             if ($parameter->isOptional()) {
                 return $parameter->getDefaultValue();
             }