gravityview / GravityView

vendor_prefixed/illuminate/filesystem/Filesystem.php

Indentation +557 added lines, -557 removed lines

@@ -16,561 +16,561 @@
 
 class Filesystem
 {
-    use Macroable;
-
-    /**
-     * Determine if a file or directory exists.
-     *
-     * @param  string  $path
-     * @return bool
-     */
-    public function exists($path)
-    {
-        return file_exists($path);
-    }
-
-    /**
-     * Get the contents of a file.
-     *
-     * @param  string  $path
-     * @param  bool  $lock
-     * @return string
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get($path, $lock = false)
-    {
-        if ($this->isFile($path)) {
-            return $lock ? $this->sharedGet($path) : file_get_contents($path);
-        }
-
-        throw new FileNotFoundException("File does not exist at path {$path}");
-    }
-
-    /**
-     * Get contents of a file with shared access.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function sharedGet($path)
-    {
-        $contents = '';
-
-        $handle = fopen($path, 'rb');
-
-        if ($handle) {
-            try {
-                if (flock($handle, LOCK_SH)) {
-                    clearstatcache(true, $path);
-
-                    $contents = fread($handle, $this->size($path) ?: 1);
-
-                    flock($handle, LOCK_UN);
-                }
-            } finally {
-                fclose($handle);
-            }
-        }
-
-        return $contents;
-    }
-
-    /**
-     * Get the returned value of a file.
-     *
-     * @param  string  $path
-     * @return mixed
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function getRequire($path)
-    {
-        if ($this->isFile($path)) {
-            return require $path;
-        }
-
-        throw new FileNotFoundException("File does not exist at path {$path}");
-    }
-
-    /**
-     * Require the given file once.
-     *
-     * @param  string  $file
-     * @return mixed
-     */
-    public function requireOnce($file)
-    {
-        require_once $file;
-    }
-
-    /**
-     * Get the MD5 hash of the file at the given path.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function hash($path)
-    {
-        return md5_file($path);
-    }
-
-    /**
-     * Write the contents of a file.
-     *
-     * @param  string  $path
-     * @param  string  $contents
-     * @param  bool  $lock
-     * @return int
-     */
-    public function put($path, $contents, $lock = false)
-    {
-        return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
-    }
-
-    /**
-     * Prepend to a file.
-     *
-     * @param  string  $path
-     * @param  string  $data
-     * @return int
-     */
-    public function prepend($path, $data)
-    {
-        if ($this->exists($path)) {
-            return $this->put($path, $data.$this->get($path));
-        }
-
-        return $this->put($path, $data);
-    }
-
-    /**
-     * Append to a file.
-     *
-     * @param  string  $path
-     * @param  string  $data
-     * @return int
-     */
-    public function append($path, $data)
-    {
-        return file_put_contents($path, $data, FILE_APPEND);
-    }
-
-    /**
-     * Get or set UNIX mode of a file or directory.
-     *
-     * @param  string  $path
-     * @param  int  $mode
-     * @return mixed
-     */
-    public function chmod($path, $mode = null)
-    {
-        if ($mode) {
-            return chmod($path, $mode);
-        }
-
-        return substr(sprintf('%o', fileperms($path)), -4);
-    }
-
-    /**
-     * Delete the file at a given path.
-     *
-     * @param  string|array  $paths
-     * @return bool
-     */
-    public function delete($paths)
-    {
-        $paths = is_array($paths) ? $paths : func_get_args();
-
-        $success = true;
-
-        foreach ($paths as $path) {
-            try {
-                if (! @unlink($path)) {
-                    $success = false;
-                }
-            } catch (ErrorException $e) {
-                $success = false;
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Move a file to a new location.
-     *
-     * @param  string  $path
-     * @param  string  $target
-     * @return bool
-     */
-    public function move($path, $target)
-    {
-        return rename($path, $target);
-    }
-
-    /**
-     * Copy a file to a new location.
-     *
-     * @param  string  $path
-     * @param  string  $target
-     * @return bool
-     */
-    public function copy($path, $target)
-    {
-        return copy($path, $target);
-    }
-
-    /**
-     * Create a hard link to the target file or directory.
-     *
-     * @param  string  $target
-     * @param  string  $link
-     * @return void
-     */
-    public function link($target, $link)
-    {
-        if (! windows_os()) {
-            return symlink($target, $link);
-        }
-
-        $mode = $this->isDirectory($target) ? 'J' : 'H';
-
-        exec("mklink /{$mode} \"{$link}\" \"{$target}\"");
-    }
-
-    /**
-     * Extract the file name from a file path.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function name($path)
-    {
-        return pathinfo($path, PATHINFO_FILENAME);
-    }
-
-    /**
-     * Extract the trailing name component from a file path.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function basename($path)
-    {
-        return pathinfo($path, PATHINFO_BASENAME);
-    }
-
-    /**
-     * Extract the parent directory from a file path.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function dirname($path)
-    {
-        return pathinfo($path, PATHINFO_DIRNAME);
-    }
-
-    /**
-     * Extract the file extension from a file path.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function extension($path)
-    {
-        return pathinfo($path, PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Get the file type of a given file.
-     *
-     * @param  string  $path
-     * @return string
-     */
-    public function type($path)
-    {
-        return filetype($path);
-    }
-
-    /**
-     * Get the mime-type of a given file.
-     *
-     * @param  string  $path
-     * @return string|false
-     */
-    public function mimeType($path)
-    {
-        return finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
-    }
-
-    /**
-     * Get the file size of a given file.
-     *
-     * @param  string  $path
-     * @return int
-     */
-    public function size($path)
-    {
-        return filesize($path);
-    }
-
-    /**
-     * Get the file's last modification time.
-     *
-     * @param  string  $path
-     * @return int
-     */
-    public function lastModified($path)
-    {
-        return filemtime($path);
-    }
-
-    /**
-     * Determine if the given path is a directory.
-     *
-     * @param  string  $directory
-     * @return bool
-     */
-    public function isDirectory($directory)
-    {
-        return is_dir($directory);
-    }
-
-    /**
-     * Determine if the given path is readable.
-     *
-     * @param  string  $path
-     * @return bool
-     */
-    public function isReadable($path)
-    {
-        return is_readable($path);
-    }
-
-    /**
-     * Determine if the given path is writable.
-     *
-     * @param  string  $path
-     * @return bool
-     */
-    public function isWritable($path)
-    {
-        return is_writable($path);
-    }
-
-    /**
-     * Determine if the given path is a file.
-     *
-     * @param  string  $file
-     * @return bool
-     */
-    public function isFile($file)
-    {
-        return is_file($file);
-    }
-
-    /**
-     * Find path names matching a given pattern.
-     *
-     * @param  string  $pattern
-     * @param  int     $flags
-     * @return array
-     */
-    public function glob($pattern, $flags = 0)
-    {
-        return glob($pattern, $flags);
-    }
-
-    /**
-     * Get an array of all files in a directory.
-     *
-     * @param  string  $directory
-     * @return array
-     */
-    public function files($directory)
-    {
-        $glob = glob($directory.DIRECTORY_SEPARATOR.'*');
-
-        if ($glob === false) {
-            return [];
-        }
-
-        // To get the appropriate files, we'll simply glob the directory and filter
-        // out any "files" that are not truly files so we do not end up with any
-        // directories in our list, but only true files within the directory.
-        return array_filter($glob, function ($file) {
-            return filetype($file) == 'file';
-        });
-    }
-
-    /**
-     * Get all of the files from the given directory (recursive).
-     *
-     * @param  string  $directory
-     * @param  bool  $hidden
-     * @return array
-     */
-    public function allFiles($directory, $hidden = false)
-    {
-        return iterator_to_array(Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory), false);
-    }
-
-    /**
-     * Get all of the directories within a given directory.
-     *
-     * @param  string  $directory
-     * @return array
-     */
-    public function directories($directory)
-    {
-        $directories = [];
-
-        foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir) {
-            $directories[] = $dir->getPathname();
-        }
-
-        return $directories;
-    }
-
-    /**
-     * Create a directory.
-     *
-     * @param  string  $path
-     * @param  int     $mode
-     * @param  bool    $recursive
-     * @param  bool    $force
-     * @return bool
-     */
-    public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
-    {
-        if ($force) {
-            return @mkdir($path, $mode, $recursive);
-        }
-
-        return mkdir($path, $mode, $recursive);
-    }
-
-    /**
-     * Move a directory.
-     *
-     * @param  string  $from
-     * @param  string  $to
-     * @param  bool  $overwrite
-     * @return bool
-     */
-    public function moveDirectory($from, $to, $overwrite = false)
-    {
-        if ($overwrite && $this->isDirectory($to)) {
-            if (! $this->deleteDirectory($to)) {
-                return false;
-            }
-        }
-
-        return @rename($from, $to) === true;
-    }
-
-    /**
-     * Copy a directory from one location to another.
-     *
-     * @param  string  $directory
-     * @param  string  $destination
-     * @param  int     $options
-     * @return bool
-     */
-    public function copyDirectory($directory, $destination, $options = null)
-    {
-        if (! $this->isDirectory($directory)) {
-            return false;
-        }
-
-        $options = $options ?: FilesystemIterator::SKIP_DOTS;
-
-        // If the destination directory does not actually exist, we will go ahead and
-        // create it recursively, which just gets the destination prepared to copy
-        // the files over. Once we make the directory we'll proceed the copying.
-        if (! $this->isDirectory($destination)) {
-            $this->makeDirectory($destination, 0777, true);
-        }
-
-        $items = new FilesystemIterator($directory, $options);
-
-        foreach ($items as $item) {
-            // As we spin through items, we will check to see if the current file is actually
-            // a directory or a file. When it is actually a directory we will need to call
-            // back into this function recursively to keep copying these nested folders.
-            $target = $destination.'/'.$item->getBasename();
-
-            if ($item->isDir()) {
-                $path = $item->getPathname();
-
-                if (! $this->copyDirectory($path, $target, $options)) {
-                    return false;
-                }
-            }
-
-            // If the current items is just a regular file, we will just copy this to the new
-            // location and keep looping. If for some reason the copy fails we'll bail out
-            // and return false, so the developer is aware that the copy process failed.
-            else {
-                if (! $this->copy($item->getPathname(), $target)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Recursively delete a directory.
-     *
-     * The directory itself may be optionally preserved.
-     *
-     * @param  string  $directory
-     * @param  bool    $preserve
-     * @return bool
-     */
-    public function deleteDirectory($directory, $preserve = false)
-    {
-        if (! $this->isDirectory($directory)) {
-            return false;
-        }
-
-        $items = new FilesystemIterator($directory);
-
-        foreach ($items as $item) {
-            // If the item is a directory, we can just recurse into the function and
-            // delete that sub-directory otherwise we'll just delete the file and
-            // keep iterating through each file until the directory is cleaned.
-            if ($item->isDir() && ! $item->isLink()) {
-                $this->deleteDirectory($item->getPathname());
-            }
-
-            // If the item is just a file, we can go ahead and delete it since we're
-            // just looping through and waxing all of the files in this directory
-            // and calling directories recursively, so we delete the real path.
-            else {
-                $this->delete($item->getPathname());
-            }
-        }
-
-        if (! $preserve) {
-            @rmdir($directory);
-        }
-
-        return true;
-    }
-
-    /**
-     * Empty the specified directory of all files and folders.
-     *
-     * @param  string  $directory
-     * @return bool
-     */
-    public function cleanDirectory($directory)
-    {
-        return $this->deleteDirectory($directory, true);
-    }
+	use Macroable;
+
+	/**
+	 * Determine if a file or directory exists.
+	 *
+	 * @param  string  $path
+	 * @return bool
+	 */
+	public function exists($path)
+	{
+		return file_exists($path);
+	}
+
+	/**
+	 * Get the contents of a file.
+	 *
+	 * @param  string  $path
+	 * @param  bool  $lock
+	 * @return string
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
+	 */
+	public function get($path, $lock = false)
+	{
+		if ($this->isFile($path)) {
+			return $lock ? $this->sharedGet($path) : file_get_contents($path);
+		}
+
+		throw new FileNotFoundException("File does not exist at path {$path}");
+	}
+
+	/**
+	 * Get contents of a file with shared access.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function sharedGet($path)
+	{
+		$contents = '';
+
+		$handle = fopen($path, 'rb');
+
+		if ($handle) {
+			try {
+				if (flock($handle, LOCK_SH)) {
+					clearstatcache(true, $path);
+
+					$contents = fread($handle, $this->size($path) ?: 1);
+
+					flock($handle, LOCK_UN);
+				}
+			} finally {
+				fclose($handle);
+			}
+		}
+
+		return $contents;
+	}
+
+	/**
+	 * Get the returned value of a file.
+	 *
+	 * @param  string  $path
+	 * @return mixed
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
+	 */
+	public function getRequire($path)
+	{
+		if ($this->isFile($path)) {
+			return require $path;
+		}
+
+		throw new FileNotFoundException("File does not exist at path {$path}");
+	}
+
+	/**
+	 * Require the given file once.
+	 *
+	 * @param  string  $file
+	 * @return mixed
+	 */
+	public function requireOnce($file)
+	{
+		require_once $file;
+	}
+
+	/**
+	 * Get the MD5 hash of the file at the given path.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function hash($path)
+	{
+		return md5_file($path);
+	}
+
+	/**
+	 * Write the contents of a file.
+	 *
+	 * @param  string  $path
+	 * @param  string  $contents
+	 * @param  bool  $lock
+	 * @return int
+	 */
+	public function put($path, $contents, $lock = false)
+	{
+		return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
+	}
+
+	/**
+	 * Prepend to a file.
+	 *
+	 * @param  string  $path
+	 * @param  string  $data
+	 * @return int
+	 */
+	public function prepend($path, $data)
+	{
+		if ($this->exists($path)) {
+			return $this->put($path, $data.$this->get($path));
+		}
+
+		return $this->put($path, $data);
+	}
+
+	/**
+	 * Append to a file.
+	 *
+	 * @param  string  $path
+	 * @param  string  $data
+	 * @return int
+	 */
+	public function append($path, $data)
+	{
+		return file_put_contents($path, $data, FILE_APPEND);
+	}
+
+	/**
+	 * Get or set UNIX mode of a file or directory.
+	 *
+	 * @param  string  $path
+	 * @param  int  $mode
+	 * @return mixed
+	 */
+	public function chmod($path, $mode = null)
+	{
+		if ($mode) {
+			return chmod($path, $mode);
+		}
+
+		return substr(sprintf('%o', fileperms($path)), -4);
+	}
+
+	/**
+	 * Delete the file at a given path.
+	 *
+	 * @param  string|array  $paths
+	 * @return bool
+	 */
+	public function delete($paths)
+	{
+		$paths = is_array($paths) ? $paths : func_get_args();
+
+		$success = true;
+
+		foreach ($paths as $path) {
+			try {
+				if (! @unlink($path)) {
+					$success = false;
+				}
+			} catch (ErrorException $e) {
+				$success = false;
+			}
+		}
+
+		return $success;
+	}
+
+	/**
+	 * Move a file to a new location.
+	 *
+	 * @param  string  $path
+	 * @param  string  $target
+	 * @return bool
+	 */
+	public function move($path, $target)
+	{
+		return rename($path, $target);
+	}
+
+	/**
+	 * Copy a file to a new location.
+	 *
+	 * @param  string  $path
+	 * @param  string  $target
+	 * @return bool
+	 */
+	public function copy($path, $target)
+	{
+		return copy($path, $target);
+	}
+
+	/**
+	 * Create a hard link to the target file or directory.
+	 *
+	 * @param  string  $target
+	 * @param  string  $link
+	 * @return void
+	 */
+	public function link($target, $link)
+	{
+		if (! windows_os()) {
+			return symlink($target, $link);
+		}
+
+		$mode = $this->isDirectory($target) ? 'J' : 'H';
+
+		exec("mklink /{$mode} \"{$link}\" \"{$target}\"");
+	}
+
+	/**
+	 * Extract the file name from a file path.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function name($path)
+	{
+		return pathinfo($path, PATHINFO_FILENAME);
+	}
+
+	/**
+	 * Extract the trailing name component from a file path.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function basename($path)
+	{
+		return pathinfo($path, PATHINFO_BASENAME);
+	}
+
+	/**
+	 * Extract the parent directory from a file path.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function dirname($path)
+	{
+		return pathinfo($path, PATHINFO_DIRNAME);
+	}
+
+	/**
+	 * Extract the file extension from a file path.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function extension($path)
+	{
+		return pathinfo($path, PATHINFO_EXTENSION);
+	}
+
+	/**
+	 * Get the file type of a given file.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public function type($path)
+	{
+		return filetype($path);
+	}
+
+	/**
+	 * Get the mime-type of a given file.
+	 *
+	 * @param  string  $path
+	 * @return string|false
+	 */
+	public function mimeType($path)
+	{
+		return finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
+	}
+
+	/**
+	 * Get the file size of a given file.
+	 *
+	 * @param  string  $path
+	 * @return int
+	 */
+	public function size($path)
+	{
+		return filesize($path);
+	}
+
+	/**
+	 * Get the file's last modification time.
+	 *
+	 * @param  string  $path
+	 * @return int
+	 */
+	public function lastModified($path)
+	{
+		return filemtime($path);
+	}
+
+	/**
+	 * Determine if the given path is a directory.
+	 *
+	 * @param  string  $directory
+	 * @return bool
+	 */
+	public function isDirectory($directory)
+	{
+		return is_dir($directory);
+	}
+
+	/**
+	 * Determine if the given path is readable.
+	 *
+	 * @param  string  $path
+	 * @return bool
+	 */
+	public function isReadable($path)
+	{
+		return is_readable($path);
+	}
+
+	/**
+	 * Determine if the given path is writable.
+	 *
+	 * @param  string  $path
+	 * @return bool
+	 */
+	public function isWritable($path)
+	{
+		return is_writable($path);
+	}
+
+	/**
+	 * Determine if the given path is a file.
+	 *
+	 * @param  string  $file
+	 * @return bool
+	 */
+	public function isFile($file)
+	{
+		return is_file($file);
+	}
+
+	/**
+	 * Find path names matching a given pattern.
+	 *
+	 * @param  string  $pattern
+	 * @param  int     $flags
+	 * @return array
+	 */
+	public function glob($pattern, $flags = 0)
+	{
+		return glob($pattern, $flags);
+	}
+
+	/**
+	 * Get an array of all files in a directory.
+	 *
+	 * @param  string  $directory
+	 * @return array
+	 */
+	public function files($directory)
+	{
+		$glob = glob($directory.DIRECTORY_SEPARATOR.'*');
+
+		if ($glob === false) {
+			return [];
+		}
+
+		// To get the appropriate files, we'll simply glob the directory and filter
+		// out any "files" that are not truly files so we do not end up with any
+		// directories in our list, but only true files within the directory.
+		return array_filter($glob, function ($file) {
+			return filetype($file) == 'file';
+		});
+	}
+
+	/**
+	 * Get all of the files from the given directory (recursive).
+	 *
+	 * @param  string  $directory
+	 * @param  bool  $hidden
+	 * @return array
+	 */
+	public function allFiles($directory, $hidden = false)
+	{
+		return iterator_to_array(Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory), false);
+	}
+
+	/**
+	 * Get all of the directories within a given directory.
+	 *
+	 * @param  string  $directory
+	 * @return array
+	 */
+	public function directories($directory)
+	{
+		$directories = [];
+
+		foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir) {
+			$directories[] = $dir->getPathname();
+		}
+
+		return $directories;
+	}
+
+	/**
+	 * Create a directory.
+	 *
+	 * @param  string  $path
+	 * @param  int     $mode
+	 * @param  bool    $recursive
+	 * @param  bool    $force
+	 * @return bool
+	 */
+	public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
+	{
+		if ($force) {
+			return @mkdir($path, $mode, $recursive);
+		}
+
+		return mkdir($path, $mode, $recursive);
+	}
+
+	/**
+	 * Move a directory.
+	 *
+	 * @param  string  $from
+	 * @param  string  $to
+	 * @param  bool  $overwrite
+	 * @return bool
+	 */
+	public function moveDirectory($from, $to, $overwrite = false)
+	{
+		if ($overwrite && $this->isDirectory($to)) {
+			if (! $this->deleteDirectory($to)) {
+				return false;
+			}
+		}
+
+		return @rename($from, $to) === true;
+	}
+
+	/**
+	 * Copy a directory from one location to another.
+	 *
+	 * @param  string  $directory
+	 * @param  string  $destination
+	 * @param  int     $options
+	 * @return bool
+	 */
+	public function copyDirectory($directory, $destination, $options = null)
+	{
+		if (! $this->isDirectory($directory)) {
+			return false;
+		}
+
+		$options = $options ?: FilesystemIterator::SKIP_DOTS;
+
+		// If the destination directory does not actually exist, we will go ahead and
+		// create it recursively, which just gets the destination prepared to copy
+		// the files over. Once we make the directory we'll proceed the copying.
+		if (! $this->isDirectory($destination)) {
+			$this->makeDirectory($destination, 0777, true);
+		}
+
+		$items = new FilesystemIterator($directory, $options);
+
+		foreach ($items as $item) {
+			// As we spin through items, we will check to see if the current file is actually
+			// a directory or a file. When it is actually a directory we will need to call
+			// back into this function recursively to keep copying these nested folders.
+			$target = $destination.'/'.$item->getBasename();
+
+			if ($item->isDir()) {
+				$path = $item->getPathname();
+
+				if (! $this->copyDirectory($path, $target, $options)) {
+					return false;
+				}
+			}
+
+			// If the current items is just a regular file, we will just copy this to the new
+			// location and keep looping. If for some reason the copy fails we'll bail out
+			// and return false, so the developer is aware that the copy process failed.
+			else {
+				if (! $this->copy($item->getPathname(), $target)) {
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Recursively delete a directory.
+	 *
+	 * The directory itself may be optionally preserved.
+	 *
+	 * @param  string  $directory
+	 * @param  bool    $preserve
+	 * @return bool
+	 */
+	public function deleteDirectory($directory, $preserve = false)
+	{
+		if (! $this->isDirectory($directory)) {
+			return false;
+		}
+
+		$items = new FilesystemIterator($directory);
+
+		foreach ($items as $item) {
+			// If the item is a directory, we can just recurse into the function and
+			// delete that sub-directory otherwise we'll just delete the file and
+			// keep iterating through each file until the directory is cleaned.
+			if ($item->isDir() && ! $item->isLink()) {
+				$this->deleteDirectory($item->getPathname());
+			}
+
+			// If the item is just a file, we can go ahead and delete it since we're
+			// just looping through and waxing all of the files in this directory
+			// and calling directories recursively, so we delete the real path.
+			else {
+				$this->delete($item->getPathname());
+			}
+		}
+
+		if (! $preserve) {
+			@rmdir($directory);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Empty the specified directory of all files and folders.
+	 *
+	 * @param  string  $directory
+	 * @return bool
+	 */
+	public function cleanDirectory($directory)
+	{
+		return $this->deleteDirectory($directory, true);
+	}
 }

Spacing +113 added lines, -113 removed lines

@@ -24,9 +24,9 @@ 
      * @param  string  $path
      * @return bool
      */
-    public function exists($path)
+    public function exists( $path )
     {
-        return file_exists($path);
+        return file_exists( $path );
     }
 
     /**
@@ -38,13 +38,13 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function get($path, $lock = false)
+    public function get( $path, $lock = false )
     {
-        if ($this->isFile($path)) {
-            return $lock ? $this->sharedGet($path) : file_get_contents($path);
+        if ( $this->isFile( $path ) ) {
+            return $lock ? $this->sharedGet( $path ) : file_get_contents( $path );
         }
 
-        throw new FileNotFoundException("File does not exist at path {$path}");
+        throw new FileNotFoundException( "File does not exist at path {$path}" );
     }
 
     /**
@@ -53,23 +53,23 @@ 
      * @param  string  $path
      * @return string
      */
-    public function sharedGet($path)
+    public function sharedGet( $path )
     {
         $contents = '';
 
-        $handle = fopen($path, 'rb');
+        $handle = fopen( $path, 'rb' );
 
-        if ($handle) {
+        if ( $handle ) {
             try {
-                if (flock($handle, LOCK_SH)) {
-                    clearstatcache(true, $path);
+                if ( flock( $handle, LOCK_SH ) ) {
+                    clearstatcache( true, $path );
 
-                    $contents = fread($handle, $this->size($path) ?: 1);
+                    $contents = fread( $handle, $this->size( $path ) ?: 1 );
 
-                    flock($handle, LOCK_UN);
+                    flock( $handle, LOCK_UN );
                 }
             } finally {
-                fclose($handle);
+                fclose( $handle );
             }
         }
 
@@ -84,13 +84,13 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function getRequire($path)
+    public function getRequire( $path )
     {
-        if ($this->isFile($path)) {
+        if ( $this->isFile( $path ) ) {
             return require $path;
         }
 
-        throw new FileNotFoundException("File does not exist at path {$path}");
+        throw new FileNotFoundException( "File does not exist at path {$path}" );
     }
 
     /**
@@ -99,7 +99,7 @@ 
      * @param  string  $file
      * @return mixed
      */
-    public function requireOnce($file)
+    public function requireOnce( $file )
     {
         require_once $file;
     }
@@ -110,9 +110,9 @@ 
      * @param  string  $path
      * @return string
      */
-    public function hash($path)
+    public function hash( $path )
     {
-        return md5_file($path);
+        return md5_file( $path );
     }
 
     /**
@@ -123,9 +123,9 @@ 
      * @param  bool  $lock
      * @return int
      */
-    public function put($path, $contents, $lock = false)
+    public function put( $path, $contents, $lock = false )
     {
-        return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
+        return file_put_contents( $path, $contents, $lock ? LOCK_EX : 0 );
     }
 
     /**
@@ -135,13 +135,13 @@ 
      * @param  string  $data
      * @return int
      */
-    public function prepend($path, $data)
+    public function prepend( $path, $data )
     {
-        if ($this->exists($path)) {
-            return $this->put($path, $data.$this->get($path));
+        if ( $this->exists( $path ) ) {
+            return $this->put( $path, $data . $this->get( $path ) );
         }
 
-        return $this->put($path, $data);
+        return $this->put( $path, $data );
     }
 
     /**
@@ -151,9 +151,9 @@ 
      * @param  string  $data
      * @return int
      */
-    public function append($path, $data)
+    public function append( $path, $data )
     {
-        return file_put_contents($path, $data, FILE_APPEND);
+        return file_put_contents( $path, $data, FILE_APPEND );
     }
 
     /**
@@ -163,13 +163,13 @@ 
      * @param  int  $mode
      * @return mixed
      */
-    public function chmod($path, $mode = null)
+    public function chmod( $path, $mode = null )
     {
-        if ($mode) {
-            return chmod($path, $mode);
+        if ( $mode ) {
+            return chmod( $path, $mode );
         }
 
-        return substr(sprintf('%o', fileperms($path)), -4);
+        return substr( sprintf( '%o', fileperms( $path ) ), -4 );
     }
 
     /**
@@ -178,18 +178,18 @@ 
      * @param  string|array  $paths
      * @return bool
      */
-    public function delete($paths)
+    public function delete( $paths )
     {
-        $paths = is_array($paths) ? $paths : func_get_args();
+        $paths = is_array( $paths ) ? $paths : func_get_args();
 
         $success = true;
 
-        foreach ($paths as $path) {
+        foreach ( $paths as $path ) {
             try {
-                if (! @unlink($path)) {
+                if ( ! @unlink( $path ) ) {
                     $success = false;
                 }
-            } catch (ErrorException $e) {
+            } catch ( ErrorException $e ) {
                 $success = false;
             }
         }
@@ -204,9 +204,9 @@ 
      * @param  string  $target
      * @return bool
      */
-    public function move($path, $target)
+    public function move( $path, $target )
     {
-        return rename($path, $target);
+        return rename( $path, $target );
     }
 
     /**
@@ -216,9 +216,9 @@ 
      * @param  string  $target
      * @return bool
      */
-    public function copy($path, $target)
+    public function copy( $path, $target )
     {
-        return copy($path, $target);
+        return copy( $path, $target );
     }
 
     /**
@@ -228,15 +228,15 @@ 
      * @param  string  $link
      * @return void
      */
-    public function link($target, $link)
+    public function link( $target, $link )
     {
-        if (! windows_os()) {
-            return symlink($target, $link);
+        if ( ! windows_os() ) {
+            return symlink( $target, $link );
         }
 
-        $mode = $this->isDirectory($target) ? 'J' : 'H';
+        $mode = $this->isDirectory( $target ) ? 'J' : 'H';
 
-        exec("mklink /{$mode} \"{$link}\" \"{$target}\"");
+        exec( "mklink /{$mode} \"{$link}\" \"{$target}\"" );
     }
 
     /**
@@ -245,9 +245,9 @@ 
      * @param  string  $path
      * @return string
      */
-    public function name($path)
+    public function name( $path )
     {
-        return pathinfo($path, PATHINFO_FILENAME);
+        return pathinfo( $path, PATHINFO_FILENAME );
     }
 
     /**
@@ -256,9 +256,9 @@ 
      * @param  string  $path
      * @return string
      */
-    public function basename($path)
+    public function basename( $path )
     {
-        return pathinfo($path, PATHINFO_BASENAME);
+        return pathinfo( $path, PATHINFO_BASENAME );
     }
 
     /**
@@ -267,9 +267,9 @@ 
      * @param  string  $path
      * @return string
      */
-    public function dirname($path)
+    public function dirname( $path )
     {
-        return pathinfo($path, PATHINFO_DIRNAME);
+        return pathinfo( $path, PATHINFO_DIRNAME );
     }
 
     /**
@@ -278,9 +278,9 @@ 
      * @param  string  $path
      * @return string
      */
-    public function extension($path)
+    public function extension( $path )
     {
-        return pathinfo($path, PATHINFO_EXTENSION);
+        return pathinfo( $path, PATHINFO_EXTENSION );
     }
 
     /**
@@ -289,9 +289,9 @@ 
      * @param  string  $path
      * @return string
      */
-    public function type($path)
+    public function type( $path )
     {
-        return filetype($path);
+        return filetype( $path );
     }
 
     /**
@@ -300,9 +300,9 @@ 
      * @param  string  $path
      * @return string|false
      */
-    public function mimeType($path)
+    public function mimeType( $path )
     {
-        return finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
+        return finfo_file( finfo_open( FILEINFO_MIME_TYPE ), $path );
     }
 
     /**
@@ -311,9 +311,9 @@ 
      * @param  string  $path
      * @return int
      */
-    public function size($path)
+    public function size( $path )
     {
-        return filesize($path);
+        return filesize( $path );
     }
 
     /**
@@ -322,9 +322,9 @@ 
      * @param  string  $path
      * @return int
      */
-    public function lastModified($path)
+    public function lastModified( $path )
     {
-        return filemtime($path);
+        return filemtime( $path );
     }
 
     /**
@@ -333,9 +333,9 @@ 
      * @param  string  $directory
      * @return bool
      */
-    public function isDirectory($directory)
+    public function isDirectory( $directory )
     {
-        return is_dir($directory);
+        return is_dir( $directory );
     }
 
     /**
@@ -344,9 +344,9 @@ 
      * @param  string  $path
      * @return bool
      */
-    public function isReadable($path)
+    public function isReadable( $path )
     {
-        return is_readable($path);
+        return is_readable( $path );
     }
 
     /**
@@ -355,9 +355,9 @@ 
      * @param  string  $path
      * @return bool
      */
-    public function isWritable($path)
+    public function isWritable( $path )
     {
-        return is_writable($path);
+        return is_writable( $path );
     }
 
     /**
@@ -366,9 +366,9 @@ 
      * @param  string  $file
      * @return bool
      */
-    public function isFile($file)
+    public function isFile( $file )
     {
-        return is_file($file);
+        return is_file( $file );
     }
 
     /**
@@ -378,9 +378,9 @@ 
      * @param  int     $flags
      * @return array
      */
-    public function glob($pattern, $flags = 0)
+    public function glob( $pattern, $flags = 0 )
     {
-        return glob($pattern, $flags);
+        return glob( $pattern, $flags );
     }
 
     /**
@@ -389,19 +389,19 @@ 
      * @param  string  $directory
      * @return array
      */
-    public function files($directory)
+    public function files( $directory )
     {
-        $glob = glob($directory.DIRECTORY_SEPARATOR.'*');
+        $glob = glob( $directory . DIRECTORY_SEPARATOR . '*' );
 
-        if ($glob === false) {
-            return [];
+        if ( $glob === false ) {
+            return [ ];
         }
 
         // To get the appropriate files, we'll simply glob the directory and filter
         // out any "files" that are not truly files so we do not end up with any
         // directories in our list, but only true files within the directory.
-        return array_filter($glob, function ($file) {
-            return filetype($file) == 'file';
+        return array_filter( $glob, function( $file ) {
+            return filetype( $file ) == 'file';
         });
     }
 
@@ -412,9 +412,9 @@ 
      * @param  bool  $hidden
      * @return array
      */
-    public function allFiles($directory, $hidden = false)
+    public function allFiles( $directory, $hidden = false )
     {
-        return iterator_to_array(Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory), false);
+        return iterator_to_array( Finder::create()->files()->ignoreDotFiles( ! $hidden )->in( $directory ), false );
     }
 
     /**
@@ -423,12 +423,12 @@ 
      * @param  string  $directory
      * @return array
      */
-    public function directories($directory)
+    public function directories( $directory )
     {
-        $directories = [];
+        $directories = [ ];
 
-        foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir) {
-            $directories[] = $dir->getPathname();
+        foreach ( Finder::create()->in( $directory )->directories()->depth( 0 ) as $dir ) {
+            $directories[ ] = $dir->getPathname();
         }
 
         return $directories;
@@ -443,13 +443,13 @@ 
      * @param  bool    $force
      * @return bool
      */
-    public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
+    public function makeDirectory( $path, $mode = 0755, $recursive = false, $force = false )
     {
-        if ($force) {
-            return @mkdir($path, $mode, $recursive);
+        if ( $force ) {
+            return @mkdir( $path, $mode, $recursive );
         }
 
-        return mkdir($path, $mode, $recursive);
+        return mkdir( $path, $mode, $recursive );
     }
 
     /**
@@ -460,15 +460,15 @@ 
      * @param  bool  $overwrite
      * @return bool
      */
-    public function moveDirectory($from, $to, $overwrite = false)
+    public function moveDirectory( $from, $to, $overwrite = false )
     {
-        if ($overwrite && $this->isDirectory($to)) {
-            if (! $this->deleteDirectory($to)) {
+        if ( $overwrite && $this->isDirectory( $to ) ) {
+            if ( ! $this->deleteDirectory( $to ) ) {
                 return false;
             }
         }
 
-        return @rename($from, $to) === true;
+        return @rename( $from, $to ) === true;
     }
 
     /**
@@ -479,9 +479,9 @@ 
      * @param  int     $options
      * @return bool
      */
-    public function copyDirectory($directory, $destination, $options = null)
+    public function copyDirectory( $directory, $destination, $options = null )
     {
-        if (! $this->isDirectory($directory)) {
+        if ( ! $this->isDirectory( $directory ) ) {
             return false;
         }
 
@@ -490,22 +490,22 @@ 
         // If the destination directory does not actually exist, we will go ahead and
         // create it recursively, which just gets the destination prepared to copy
         // the files over. Once we make the directory we'll proceed the copying.
-        if (! $this->isDirectory($destination)) {
-            $this->makeDirectory($destination, 0777, true);
+        if ( ! $this->isDirectory( $destination ) ) {
+            $this->makeDirectory( $destination, 0777, true );
         }
 
-        $items = new FilesystemIterator($directory, $options);
+        $items = new FilesystemIterator( $directory, $options );
 
-        foreach ($items as $item) {
+        foreach ( $items as $item ) {
             // As we spin through items, we will check to see if the current file is actually
             // a directory or a file. When it is actually a directory we will need to call
             // back into this function recursively to keep copying these nested folders.
-            $target = $destination.'/'.$item->getBasename();
+            $target = $destination . '/' . $item->getBasename();
 
-            if ($item->isDir()) {
+            if ( $item->isDir() ) {
                 $path = $item->getPathname();
 
-                if (! $this->copyDirectory($path, $target, $options)) {
+                if ( ! $this->copyDirectory( $path, $target, $options ) ) {
                     return false;
                 }
             }
@@ -514,7 +514,7 @@ 
             // location and keep looping. If for some reason the copy fails we'll bail out
             // and return false, so the developer is aware that the copy process failed.
             else {
-                if (! $this->copy($item->getPathname(), $target)) {
+                if ( ! $this->copy( $item->getPathname(), $target ) ) {
                     return false;
                 }
             }
@@ -532,32 +532,32 @@ 
      * @param  bool    $preserve
      * @return bool
      */
-    public function deleteDirectory($directory, $preserve = false)
+    public function deleteDirectory( $directory, $preserve = false )
     {
-        if (! $this->isDirectory($directory)) {
+        if ( ! $this->isDirectory( $directory ) ) {
             return false;
         }
 
-        $items = new FilesystemIterator($directory);
+        $items = new FilesystemIterator( $directory );
 
-        foreach ($items as $item) {
+        foreach ( $items as $item ) {
             // If the item is a directory, we can just recurse into the function and
             // delete that sub-directory otherwise we'll just delete the file and
             // keep iterating through each file until the directory is cleaned.
-            if ($item->isDir() && ! $item->isLink()) {
-                $this->deleteDirectory($item->getPathname());
+            if ( $item->isDir() && ! $item->isLink() ) {
+                $this->deleteDirectory( $item->getPathname() );
             }
 
             // If the item is just a file, we can go ahead and delete it since we're
             // just looping through and waxing all of the files in this directory
             // and calling directories recursively, so we delete the real path.
             else {
-                $this->delete($item->getPathname());
+                $this->delete( $item->getPathname() );
             }
         }
 
-        if (! $preserve) {
-            @rmdir($directory);
+        if ( ! $preserve ) {
+            @rmdir( $directory );
         }
 
         return true;
@@ -569,8 +569,8 @@ 
      * @param  string  $directory
      * @return bool
      */
-    public function cleanDirectory($directory)
+    public function cleanDirectory( $directory )
     {
-        return $this->deleteDirectory($directory, true);
+        return $this->deleteDirectory( $directory, true );
     }
 }

Braces +36 added lines, -72 removed lines

@@ -14,8 +14,7 @@ 
 use GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Support\Traits\Macroable;
 use GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException;
 
-class Filesystem
-{
+class Filesystem {
     use Macroable;
 
     /**
@@ -24,8 +23,7 @@ 
      * @param  string  $path
      * @return bool
      */
-    public function exists($path)
-    {
+    public function exists($path) {
         return file_exists($path);
     }
 
@@ -38,8 +36,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function get($path, $lock = false)
-    {
+    public function get($path, $lock = false) {
         if ($this->isFile($path)) {
             return $lock ? $this->sharedGet($path) : file_get_contents($path);
         }
@@ -53,8 +50,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function sharedGet($path)
-    {
+    public function sharedGet($path) {
         $contents = '';
 
         $handle = fopen($path, 'rb');
@@ -84,8 +80,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function getRequire($path)
-    {
+    public function getRequire($path) {
         if ($this->isFile($path)) {
             return require $path;
         }
@@ -99,8 +94,7 @@ 
      * @param  string  $file
      * @return mixed
      */
-    public function requireOnce($file)
-    {
+    public function requireOnce($file) {
         require_once $file;
     }
 
@@ -110,8 +104,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function hash($path)
-    {
+    public function hash($path) {
         return md5_file($path);
     }
 
@@ -123,8 +116,7 @@ 
      * @param  bool  $lock
      * @return int
      */
-    public function put($path, $contents, $lock = false)
-    {
+    public function put($path, $contents, $lock = false) {
         return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
     }
 
@@ -135,8 +127,7 @@ 
      * @param  string  $data
      * @return int
      */
-    public function prepend($path, $data)
-    {
+    public function prepend($path, $data) {
         if ($this->exists($path)) {
             return $this->put($path, $data.$this->get($path));
         }
@@ -151,8 +142,7 @@ 
      * @param  string  $data
      * @return int
      */
-    public function append($path, $data)
-    {
+    public function append($path, $data) {
         return file_put_contents($path, $data, FILE_APPEND);
     }
 
@@ -163,8 +153,7 @@ 
      * @param  int  $mode
      * @return mixed
      */
-    public function chmod($path, $mode = null)
-    {
+    public function chmod($path, $mode = null) {
         if ($mode) {
             return chmod($path, $mode);
         }
@@ -178,8 +167,7 @@ 
      * @param  string|array  $paths
      * @return bool
      */
-    public function delete($paths)
-    {
+    public function delete($paths) {
         $paths = is_array($paths) ? $paths : func_get_args();
 
         $success = true;
@@ -204,8 +192,7 @@ 
      * @param  string  $target
      * @return bool
      */
-    public function move($path, $target)
-    {
+    public function move($path, $target) {
         return rename($path, $target);
     }
 
@@ -216,8 +203,7 @@ 
      * @param  string  $target
      * @return bool
      */
-    public function copy($path, $target)
-    {
+    public function copy($path, $target) {
         return copy($path, $target);
     }
 
@@ -228,8 +214,7 @@ 
      * @param  string  $link
      * @return void
      */
-    public function link($target, $link)
-    {
+    public function link($target, $link) {
         if (! windows_os()) {
             return symlink($target, $link);
         }
@@ -245,8 +230,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function name($path)
-    {
+    public function name($path) {
         return pathinfo($path, PATHINFO_FILENAME);
     }
 
@@ -256,8 +240,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function basename($path)
-    {
+    public function basename($path) {
         return pathinfo($path, PATHINFO_BASENAME);
     }
 
@@ -267,8 +250,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function dirname($path)
-    {
+    public function dirname($path) {
         return pathinfo($path, PATHINFO_DIRNAME);
     }
 
@@ -278,8 +260,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function extension($path)
-    {
+    public function extension($path) {
         return pathinfo($path, PATHINFO_EXTENSION);
     }
 
@@ -289,8 +270,7 @@ 
      * @param  string  $path
      * @return string
      */
-    public function type($path)
-    {
+    public function type($path) {
         return filetype($path);
     }
 
@@ -300,8 +280,7 @@ 
      * @param  string  $path
      * @return string|false
      */
-    public function mimeType($path)
-    {
+    public function mimeType($path) {
         return finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
     }
 
@@ -311,8 +290,7 @@ 
      * @param  string  $path
      * @return int
      */
-    public function size($path)
-    {
+    public function size($path) {
         return filesize($path);
     }
 
@@ -322,8 +300,7 @@ 
      * @param  string  $path
      * @return int
      */
-    public function lastModified($path)
-    {
+    public function lastModified($path) {
         return filemtime($path);
     }
 
@@ -333,8 +310,7 @@ 
      * @param  string  $directory
      * @return bool
      */
-    public function isDirectory($directory)
-    {
+    public function isDirectory($directory) {
         return is_dir($directory);
     }
 
@@ -344,8 +320,7 @@ 
      * @param  string  $path
      * @return bool
      */
-    public function isReadable($path)
-    {
+    public function isReadable($path) {
         return is_readable($path);
     }
 
@@ -355,8 +330,7 @@ 
      * @param  string  $path
      * @return bool
      */
-    public function isWritable($path)
-    {
+    public function isWritable($path) {
         return is_writable($path);
     }
 
@@ -366,8 +340,7 @@ 
      * @param  string  $file
      * @return bool
      */
-    public function isFile($file)
-    {
+    public function isFile($file) {
         return is_file($file);
     }
 
@@ -378,8 +351,7 @@ 
      * @param  int     $flags
      * @return array
      */
-    public function glob($pattern, $flags = 0)
-    {
+    public function glob($pattern, $flags = 0) {
         return glob($pattern, $flags);
     }
 
@@ -389,8 +361,7 @@ 
      * @param  string  $directory
      * @return array
      */
-    public function files($directory)
-    {
+    public function files($directory) {
         $glob = glob($directory.DIRECTORY_SEPARATOR.'*');
 
         if ($glob === false) {
@@ -412,8 +383,7 @@ 
      * @param  bool  $hidden
      * @return array
      */
-    public function allFiles($directory, $hidden = false)
-    {
+    public function allFiles($directory, $hidden = false) {
         return iterator_to_array(Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory), false);
     }
 
@@ -423,8 +393,7 @@ 
      * @param  string  $directory
      * @return array
      */
-    public function directories($directory)
-    {
+    public function directories($directory) {
         $directories = [];
 
         foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir) {
@@ -443,8 +412,7 @@ 
      * @param  bool    $force
      * @return bool
      */
-    public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
-    {
+    public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false) {
         if ($force) {
             return @mkdir($path, $mode, $recursive);
         }
@@ -460,8 +428,7 @@ 
      * @param  bool  $overwrite
      * @return bool
      */
-    public function moveDirectory($from, $to, $overwrite = false)
-    {
+    public function moveDirectory($from, $to, $overwrite = false) {
         if ($overwrite && $this->isDirectory($to)) {
             if (! $this->deleteDirectory($to)) {
                 return false;
@@ -479,8 +446,7 @@ 
      * @param  int     $options
      * @return bool
      */
-    public function copyDirectory($directory, $destination, $options = null)
-    {
+    public function copyDirectory($directory, $destination, $options = null) {
         if (! $this->isDirectory($directory)) {
             return false;
         }
@@ -532,8 +498,7 @@ 
      * @param  bool    $preserve
      * @return bool
      */
-    public function deleteDirectory($directory, $preserve = false)
-    {
+    public function deleteDirectory($directory, $preserve = false) {
         if (! $this->isDirectory($directory)) {
             return false;
         }
@@ -569,8 +534,7 @@ 
      * @param  string  $directory
      * @return bool
      */
-    public function cleanDirectory($directory)
-    {
+    public function cleanDirectory($directory) {
         return $this->deleteDirectory($directory, true);
     }
 }

vendor_prefixed/illuminate/container/Container.php

Indentation +1207 added lines, -1207 removed lines

@@ -18,1211 +18,1211 @@
 
 class Container implements ArrayAccess, ContainerContract
 {
-    /**
-     * The current globally available container (if any).
-     *
-     * @var static
-     */
-    protected static $instance;
-
-    /**
-     * An array of the types that have been resolved.
-     *
-     * @var array
-     */
-    protected $resolved = [];
-
-    /**
-     * The container's bindings.
-     *
-     * @var array
-     */
-    protected $bindings = [];
-
-    /**
-     * The container's method bindings.
-     *
-     * @var array
-     */
-    protected $methodBindings = [];
-
-    /**
-     * The container's shared instances.
-     *
-     * @var array
-     */
-    protected $instances = [];
-
-    /**
-     * The registered type aliases.
-     *
-     * @var array
-     */
-    protected $aliases = [];
-
-    /**
-     * The registered aliases keyed by the abstract name.
-     *
-     * @var array
-     */
-    protected $abstractAliases = [];
-
-    /**
-     * The extension closures for services.
-     *
-     * @var array
-     */
-    protected $extenders = [];
-
-    /**
-     * All of the registered tags.
-     *
-     * @var array
-     */
-    protected $tags = [];
-
-    /**
-     * The stack of concretions currently being built.
-     *
-     * @var array
-     */
-    protected $buildStack = [];
-
-    /**
-     * The parameter override stack.
-     *
-     * @var array
-     */
-    protected $with = [];
-
-    /**
-     * The contextual binding map.
-     *
-     * @var array
-     */
-    public $contextual = [];
-
-    /**
-     * All of the registered rebound callbacks.
-     *
-     * @var array
-     */
-    protected $reboundCallbacks = [];
-
-    /**
-     * All of the global resolving callbacks.
-     *
-     * @var array
-     */
-    protected $globalResolvingCallbacks = [];
-
-    /**
-     * All of the global after resolving callbacks.
-     *
-     * @var array
-     */
-    protected $globalAfterResolvingCallbacks = [];
-
-    /**
-     * All of the resolving callbacks by class type.
-     *
-     * @var array
-     */
-    protected $resolvingCallbacks = [];
-
-    /**
-     * All of the after resolving callbacks by class type.
-     *
-     * @var array
-     */
-    protected $afterResolvingCallbacks = [];
-
-    /**
-     * Define a contextual binding.
-     *
-     * @param  string  $concrete
-     * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\ContextualBindingBuilder
-     */
-    public function when($concrete)
-    {
-        return new ContextualBindingBuilder($this, $this->getAlias($concrete));
-    }
-
-    /**
-     * Determine if the given abstract type has been bound.
-     *
-     * @param  string  $abstract
-     * @return bool
-     */
-    public function bound($abstract)
-    {
-        return isset($this->bindings[$abstract]) ||
-               isset($this->instances[$abstract]) ||
-               $this->isAlias($abstract);
-    }
-
-    /**
-     * Determine if the given abstract type has been resolved.
-     *
-     * @param  string  $abstract
-     * @return bool
-     */
-    public function resolved($abstract)
-    {
-        if ($this->isAlias($abstract)) {
-            $abstract = $this->getAlias($abstract);
-        }
-
-        return isset($this->resolved[$abstract]) ||
-               isset($this->instances[$abstract]);
-    }
-
-    /**
-     * Determine if a given type is shared.
-     *
-     * @param  string  $abstract
-     * @return bool
-     */
-    public function isShared($abstract)
-    {
-        return isset($this->instances[$abstract]) ||
-              (isset($this->bindings[$abstract]['shared']) &&
-               $this->bindings[$abstract]['shared'] === true);
-    }
-
-    /**
-     * Determine if a given string is an alias.
-     *
-     * @param  string  $name
-     * @return bool
-     */
-    public function isAlias($name)
-    {
-        return isset($this->aliases[$name]);
-    }
-
-    /**
-     * Register a binding with the container.
-     *
-     * @param  string|array  $abstract
-     * @param  \Closure|string|null  $concrete
-     * @param  bool  $shared
-     * @return void
-     */
-    public function bind($abstract, $concrete = null, $shared = false)
-    {
-        // If no concrete type was given, we will simply set the concrete type to the
-        // abstract type. After that, the concrete type to be registered as shared
-        // without being forced to state their classes in both of the parameters.
-        $this->dropStaleInstances($abstract);
-
-        if (is_null($concrete)) {
-            $concrete = $abstract;
-        }
-
-        // If the factory is not a Closure, it means it is just a class name which is
-        // bound into this container to the abstract type and we will just wrap it
-        // up inside its own Closure to give us more convenience when extending.
-        if (! $concrete instanceof Closure) {
-            $concrete = $this->getClosure($abstract, $concrete);
-        }
-
-        $this->bindings[$abstract] = compact('concrete', 'shared');
-
-        // If the abstract type was already resolved in this container we'll fire the
-        // rebound listener so that any objects which have already gotten resolved
-        // can have their copy of the object updated via the listener callbacks.
-        if ($this->resolved($abstract)) {
-            $this->rebound($abstract);
-        }
-    }
-
-    /**
-     * Get the Closure to be used when building a type.
-     *
-     * @param  string  $abstract
-     * @param  string  $concrete
-     * @return \Closure
-     */
-    protected function getClosure($abstract, $concrete)
-    {
-        return function ($container, $parameters = []) use ($abstract, $concrete) {
-            if ($abstract == $concrete) {
-                return $container->build($concrete);
-            }
-
-            return $container->makeWith($concrete, $parameters);
-        };
-    }
-
-    /**
-     * Determine if the container has a method binding.
-     *
-     * @param  string  $method
-     * @return bool
-     */
-    public function hasMethodBinding($method)
-    {
-        return isset($this->methodBindings[$method]);
-    }
-
-    /**
-     * Bind a callback to resolve with Container::call.
-     *
-     * @param  string  $method
-     * @param  \Closure  $callback
-     * @return void
-     */
-    public function bindMethod($method, $callback)
-    {
-        $this->methodBindings[$method] = $callback;
-    }
-
-    /**
-     * Get the method binding for the given method.
-     *
-     * @param  string  $method
-     * @param  mixed  $instance
-     * @return mixed
-     */
-    public function callMethodBinding($method, $instance)
-    {
-        return call_user_func($this->methodBindings[$method], $instance, $this);
-    }
-
-    /**
-     * Add a contextual binding to the container.
-     *
-     * @param  string  $concrete
-     * @param  string  $abstract
-     * @param  \Closure|string  $implementation
-     * @return void
-     */
-    public function addContextualBinding($concrete, $abstract, $implementation)
-    {
-        $this->contextual[$concrete][$this->getAlias($abstract)] = $implementation;
-    }
-
-    /**
-     * Register a binding if it hasn't already been registered.
-     *
-     * @param  string  $abstract
-     * @param  \Closure|string|null  $concrete
-     * @param  bool  $shared
-     * @return void
-     */
-    public function bindIf($abstract, $concrete = null, $shared = false)
-    {
-        if (! $this->bound($abstract)) {
-            $this->bind($abstract, $concrete, $shared);
-        }
-    }
-
-    /**
-     * Register a shared binding in the container.
-     *
-     * @param  string|array  $abstract
-     * @param  \Closure|string|null  $concrete
-     * @return void
-     */
-    public function singleton($abstract, $concrete = null)
-    {
-        $this->bind($abstract, $concrete, true);
-    }
-
-    /**
-     * "Extend" an abstract type in the container.
-     *
-     * @param  string    $abstract
-     * @param  \Closure  $closure
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function extend($abstract, Closure $closure)
-    {
-        $abstract = $this->getAlias($abstract);
-
-        if (isset($this->instances[$abstract])) {
-            $this->instances[$abstract] = $closure($this->instances[$abstract], $this);
-
-            $this->rebound($abstract);
-        } else {
-            $this->extenders[$abstract][] = $closure;
-
-            if ($this->resolved($abstract)) {
-                $this->rebound($abstract);
-            }
-        }
-    }
-
-    /**
-     * Register an existing instance as shared in the container.
-     *
-     * @param  string  $abstract
-     * @param  mixed   $instance
-     * @return void
-     */
-    public function instance($abstract, $instance)
-    {
-        $this->removeAbstractAlias($abstract);
-
-        $isBound = $this->bound($abstract);
-
-        unset($this->aliases[$abstract]);
-
-        // We'll check to determine if this type has been bound before, and if it has
-        // we will fire the rebound callbacks registered with the container and it
-        // can be updated with consuming classes that have gotten resolved here.
-        $this->instances[$abstract] = $instance;
-
-        if ($isBound) {
-            $this->rebound($abstract);
-        }
-    }
-
-    /**
-     * Remove an alias from the contextual binding alias cache.
-     *
-     * @param  string  $searched
-     * @return void
-     */
-    protected function removeAbstractAlias($searched)
-    {
-        if (! isset($this->aliases[$searched])) {
-            return;
-        }
-
-        foreach ($this->abstractAliases as $abstract => $aliases) {
-            foreach ($aliases as $index => $alias) {
-                if ($alias == $searched) {
-                    unset($this->abstractAliases[$abstract][$index]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Assign a set of tags to a given binding.
-     *
-     * @param  array|string  $abstracts
-     * @param  array|mixed   ...$tags
-     * @return void
-     */
-    public function tag($abstracts, $tags)
-    {
-        $tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
-
-        foreach ($tags as $tag) {
-            if (! isset($this->tags[$tag])) {
-                $this->tags[$tag] = [];
-            }
-
-            foreach ((array) $abstracts as $abstract) {
-                $this->tags[$tag][] = $abstract;
-            }
-        }
-    }
-
-    /**
-     * Resolve all of the bindings for a given tag.
-     *
-     * @param  string  $tag
-     * @return array
-     */
-    public function tagged($tag)
-    {
-        $results = [];
-
-        if (isset($this->tags[$tag])) {
-            foreach ($this->tags[$tag] as $abstract) {
-                $results[] = $this->make($abstract);
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Alias a type to a different name.
-     *
-     * @param  string  $abstract
-     * @param  string  $alias
-     * @return void
-     */
-    public function alias($abstract, $alias)
-    {
-        $this->aliases[$alias] = $abstract;
-
-        $this->abstractAliases[$abstract][] = $alias;
-    }
-
-    /**
-     * Bind a new callback to an abstract's rebind event.
-     *
-     * @param  string    $abstract
-     * @param  \Closure  $callback
-     * @return mixed
-     */
-    public function rebinding($abstract, Closure $callback)
-    {
-        $this->reboundCallbacks[$abstract = $this->getAlias($abstract)][] = $callback;
-
-        if ($this->bound($abstract)) {
-            return $this->make($abstract);
-        }
-    }
-
-    /**
-     * Refresh an instance on the given target and method.
-     *
-     * @param  string  $abstract
-     * @param  mixed   $target
-     * @param  string  $method
-     * @return mixed
-     */
-    public function refresh($abstract, $target, $method)
-    {
-        return $this->rebinding($abstract, function ($app, $instance) use ($target, $method) {
-            $target->{$method}($instance);
-        });
-    }
-
-    /**
-     * Fire the "rebound" callbacks for the given abstract type.
-     *
-     * @param  string  $abstract
-     * @return void
-     */
-    protected function rebound($abstract)
-    {
-        $instance = $this->make($abstract);
-
-        foreach ($this->getReboundCallbacks($abstract) as $callback) {
-            call_user_func($callback, $this, $instance);
-        }
-    }
-
-    /**
-     * Get the rebound callbacks for a given type.
-     *
-     * @param  string  $abstract
-     * @return array
-     */
-    protected function getReboundCallbacks($abstract)
-    {
-        if (isset($this->reboundCallbacks[$abstract])) {
-            return $this->reboundCallbacks[$abstract];
-        }
-
-        return [];
-    }
-
-    /**
-     * Wrap the given closure such that its dependencies will be injected when executed.
-     *
-     * @param  \Closure  $callback
-     * @param  array  $parameters
-     * @return \Closure
-     */
-    public function wrap(Closure $callback, array $parameters = [])
-    {
-        return function () use ($callback, $parameters) {
-            return $this->call($callback, $parameters);
-        };
-    }
-
-    /**
-     * Call the given Closure / class@method and inject its dependencies.
-     *
-     * @param  callable|string  $callback
-     * @param  array  $parameters
-     * @param  string|null  $defaultMethod
-     * @return mixed
-     */
-    public function call($callback, array $parameters = [], $defaultMethod = null)
-    {
-        return BoundMethod::call($this, $callback, $parameters, $defaultMethod);
-    }
-
-    /**
-     * Get a closure to resolve the given type from the container.
-     *
-     * @param  string  $abstract
-     * @return \Closure
-     */
-    public function factory($abstract)
-    {
-        return function () use ($abstract) {
-            return $this->make($abstract);
-        };
-    }
-
-    /**
-     * Resolve the given type with the given parameter overrides.
-     *
-     * @param  string  $abstract
-     * @param  array  $parameters
-     * @return mixed
-     */
-    public function makeWith($abstract, array $parameters)
-    {
-        return $this->resolve($abstract, $parameters);
-    }
-
-    /**
-     * Resolve the given type from the container.
-     *
-     * @param  string  $abstract
-     * @return mixed
-     */
-    public function make($abstract)
-    {
-        return $this->resolve($abstract);
-    }
-
-    /**
-     * Resolve the given type from the container.
-     *
-     * @param  string  $abstract
-     * @param  array  $parameters
-     * @return mixed
-     */
-    protected function resolve($abstract, $parameters = [])
-    {
-        $abstract = $this->getAlias($abstract);
-
-        $needsContextualBuild = ! empty($parameters) || ! is_null(
-            $this->getContextualConcrete($abstract)
-        );
-
-        // If an instance of the type is currently being managed as a singleton we'll
-        // just return an existing instance instead of instantiating new instances
-        // so the developer can keep using the same objects instance every time.
-        if (isset($this->instances[$abstract]) && ! $needsContextualBuild) {
-            return $this->instances[$abstract];
-        }
-
-        $this->with[] = $parameters;
-
-        $concrete = $this->getConcrete($abstract);
-
-        // We're ready to instantiate an instance of the concrete type registered for
-        // the binding. This will instantiate the types, as well as resolve any of
-        // its "nested" dependencies recursively until all have gotten resolved.
-        if ($this->isBuildable($concrete, $abstract)) {
-            $object = $this->build($concrete);
-        } else {
-            $object = $this->make($concrete);
-        }
-
-        // If we defined any extenders for this type, we'll need to spin through them
-        // and apply them to the object being built. This allows for the extension
-        // of services, such as changing configuration or decorating the object.
-        foreach ($this->getExtenders($abstract) as $extender) {
-            $object = $extender($object, $this);
-        }
-
-        // If the requested type is registered as a singleton we'll want to cache off
-        // the instances in "memory" so we can return it later without creating an
-        // entirely new instance of an object on each subsequent request for it.
-        if ($this->isShared($abstract) && ! $needsContextualBuild) {
-            $this->instances[$abstract] = $object;
-        }
-
-        $this->fireResolvingCallbacks($abstract, $object);
-
-        // Before returning, we will also set the resolved flag to "true" and pop off
-        // the parameter overrides for this build. After those two things are done
-        // we will be ready to return back the fully constructed class instance.
-        $this->resolved[$abstract] = true;
-
-        array_pop($this->with);
-
-        return $object;
-    }
-
-    /**
-     * Get the concrete type for a given abstract.
-     *
-     * @param  string  $abstract
-     * @return mixed   $concrete
-     */
-    protected function getConcrete($abstract)
-    {
-        if (! is_null($concrete = $this->getContextualConcrete($abstract))) {
-            return $concrete;
-        }
-
-        // If we don't have a registered resolver or concrete for the type, we'll just
-        // assume each type is a concrete name and will attempt to resolve it as is
-        // since the container should be able to resolve concretes automatically.
-        if (isset($this->bindings[$abstract])) {
-            return $this->bindings[$abstract]['concrete'];
-        }
-
-        return $abstract;
-    }
-
-    /**
-     * Get the contextual concrete binding for the given abstract.
-     *
-     * @param  string  $abstract
-     * @return string|null
-     */
-    protected function getContextualConcrete($abstract)
-    {
-        if (! is_null($binding = $this->findInContextualBindings($abstract))) {
-            return $binding;
-        }
-
-        // Next we need to see if a contextual binding might be bound under an alias of the
-        // given abstract type. So, we will need to check if any aliases exist with this
-        // type and then spin through them and check for contextual bindings on these.
-        if (empty($this->abstractAliases[$abstract])) {
-            return;
-        }
-
-        foreach ($this->abstractAliases[$abstract] as $alias) {
-            if (! is_null($binding = $this->findInContextualBindings($alias))) {
-                return $binding;
-            }
-        }
-    }
-
-    /**
-     * Find the concrete binding for the given abstract in the contextual binding array.
-     *
-     * @param  string  $abstract
-     * @return string|null
-     */
-    protected function findInContextualBindings($abstract)
-    {
-        if (isset($this->contextual[end($this->buildStack)][$abstract])) {
-            return $this->contextual[end($this->buildStack)][$abstract];
-        }
-    }
-
-    /**
-     * Determine if the given concrete is buildable.
-     *
-     * @param  mixed   $concrete
-     * @param  string  $abstract
-     * @return bool
-     */
-    protected function isBuildable($concrete, $abstract)
-    {
-        return $concrete === $abstract || $concrete instanceof Closure;
-    }
-
-    /**
-     * Instantiate a concrete instance of the given type.
-     *
-     * @param  string  $concrete
-     * @return mixed
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function build($concrete)
-    {
-        // If the concrete type is actually a Closure, we will just execute it and
-        // hand back the results of the functions, which allows functions to be
-        // used as resolvers for more fine-tuned resolution of these objects.
-        if ($concrete instanceof Closure) {
-            return $concrete($this, $this->getLastParameterOverride());
-        }
-
-        $reflector = new ReflectionClass($concrete);
-
-        // If the type is not instantiable, the developer is attempting to resolve
-        // an abstract type such as an Interface of Abstract Class and there is
-        // no binding registered for the abstractions so we need to bail out.
-        if (! $reflector->isInstantiable()) {
-            return $this->notInstantiable($concrete);
-        }
-
-        $this->buildStack[] = $concrete;
-
-        $constructor = $reflector->getConstructor();
-
-        // If there are no constructors, that means there are no dependencies then
-        // we can just resolve the instances of the objects right away, without
-        // resolving any other types or dependencies out of these containers.
-        if (is_null($constructor)) {
-            array_pop($this->buildStack);
-
-            return new $concrete;
-        }
-
-        $dependencies = $constructor->getParameters();
-
-        // Once we have all the constructor's parameters we can create each of the
-        // dependency instances and then use the reflection instances to make a
-        // new instance of this class, injecting the created dependencies in.
-        $instances = $this->resolveDependencies(
-            $dependencies
-        );
-
-        array_pop($this->buildStack);
-
-        return $reflector->newInstanceArgs($instances);
-    }
-
-    /**
-     * Resolve all of the dependencies from the ReflectionParameters.
-     *
-     * @param  array  $dependencies
-     * @return array
-     */
-    protected function resolveDependencies(array $dependencies)
-    {
-        $results = [];
-
-        foreach ($dependencies as $dependency) {
-            // If this dependency has a override for this particular build we will use
-            // that instead as the value. Otherwise, we will continue with this run
-            // of resolutions and let reflection attempt to determine the result.
-            if ($this->hasParameterOverride($dependency)) {
-                $results[] = $this->getParameterOverride($dependency);
-
-                continue;
-            }
-
-            // If the class is null, it means the dependency is a string or some other
-            // primitive type which we can not resolve since it is not a class and
-            // we will just bomb out with an error since we have no-where to go.
-            $results[] = is_null($class = $dependency->getClass())
-                            ? $this->resolvePrimitive($dependency)
-                            : $this->resolveClass($dependency);
-        }
-
-        return $results;
-    }
-
-    /**
-     * Determine if the given dependency has a parameter override from makeWith.
-     *
-     * @param  \ReflectionParameter  $dependency
-     * @return bool
-     */
-    protected function hasParameterOverride($dependency)
-    {
-        return array_key_exists(
-            $dependency->name, $this->getLastParameterOverride()
-        );
-    }
-
-    /**
-     * Get a parameter override for a dependency.
-     *
-     * @param  \ReflectionParameter  $dependency
-     * @return mixed
-     */
-    protected function getParameterOverride($dependency)
-    {
-        return $this->getLastParameterOverride()[$dependency->name];
-    }
-
-    /**
-     * Get the last parameter override.
-     *
-     * @return array
-     */
-    protected function getLastParameterOverride()
-    {
-        return count($this->with) ? end($this->with) : [];
-    }
-
-    /**
-     * Resolve a non-class hinted primitive dependency.
-     *
-     * @param  \ReflectionParameter  $parameter
-     * @return mixed
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
-     */
-    protected function resolvePrimitive(ReflectionParameter $parameter)
-    {
-        if (! is_null($concrete = $this->getContextualConcrete('$'.$parameter->name))) {
-            return $concrete instanceof Closure ? $concrete($this) : $concrete;
-        }
-
-        if ($parameter->isDefaultValueAvailable()) {
-            return $parameter->getDefaultValue();
-        }
-
-        $this->unresolvablePrimitive($parameter);
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     *
-     * @param  \ReflectionParameter  $parameter
-     * @return mixed
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
-     */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
-        try {
-            return $this->make($parameter->getClass()->name);
-        }
-
-        // If we can not resolve the class instance, we will check to see if the value
-        // is optional, and if it is we will return the optional parameter value as
-        // the value of the dependency, similarly to how we do this with scalars.
-        catch (BindingResolutionException $e) {
-            if ($parameter->isOptional()) {
-                return $parameter->getDefaultValue();
-            }
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Throw an exception that the concrete is not instantiable.
-     *
-     * @param  string  $concrete
-     * @return void
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
-     */
-    protected function notInstantiable($concrete)
-    {
-        if (! empty($this->buildStack)) {
-            $previous = implode(', ', $this->buildStack);
-
-            $message = "Target [$concrete] is not instantiable while building [$previous].";
-        } else {
-            $message = "Target [$concrete] is not instantiable.";
-        }
-
-        throw new BindingResolutionException($message);
-    }
-
-    /**
-     * Throw an exception for an unresolvable primitive.
-     *
-     * @param  \ReflectionParameter  $parameter
-     * @return void
-     *
-     * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
-     */
-    protected function unresolvablePrimitive(ReflectionParameter $parameter)
-    {
-        $message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
-
-        throw new BindingResolutionException($message);
-    }
-
-    /**
-     * Register a new resolving callback.
-     *
-     * @param  string    $abstract
-     * @param  \Closure|null  $callback
-     * @return void
-     */
-    public function resolving($abstract, Closure $callback = null)
-    {
-        if (is_string($abstract)) {
-            $abstract = $this->getAlias($abstract);
-        }
-
-        if (is_null($callback) && $abstract instanceof Closure) {
-            $this->globalResolvingCallbacks[] = $abstract;
-        } else {
-            $this->resolvingCallbacks[$abstract][] = $callback;
-        }
-    }
-
-    /**
-     * Register a new after resolving callback for all types.
-     *
-     * @param  string   $abstract
-     * @param  \Closure|null $callback
-     * @return void
-     */
-    public function afterResolving($abstract, Closure $callback = null)
-    {
-        if (is_string($abstract)) {
-            $abstract = $this->getAlias($abstract);
-        }
-
-        if ($abstract instanceof Closure && is_null($callback)) {
-            $this->globalAfterResolvingCallbacks[] = $abstract;
-        } else {
-            $this->afterResolvingCallbacks[$abstract][] = $callback;
-        }
-    }
-
-    /**
-     * Fire all of the resolving callbacks.
-     *
-     * @param  string  $abstract
-     * @param  mixed   $object
-     * @return void
-     */
-    protected function fireResolvingCallbacks($abstract, $object)
-    {
-        $this->fireCallbackArray($object, $this->globalResolvingCallbacks);
-
-        $this->fireCallbackArray(
-            $object, $this->getCallbacksForType($abstract, $object, $this->resolvingCallbacks)
-        );
-
-        $this->fireAfterResolvingCallbacks($abstract, $object);
-    }
-
-    /**
-     * Fire all of the after resolving callbacks.
-     *
-     * @param  string  $abstract
-     * @param  mixed   $object
-     * @return void
-     */
-    protected function fireAfterResolvingCallbacks($abstract, $object)
-    {
-        $this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
-
-        $this->fireCallbackArray(
-            $object, $this->getCallbacksForType($abstract, $object, $this->afterResolvingCallbacks)
-        );
-    }
-
-    /**
-     * Get all callbacks for a given type.
-     *
-     * @param  string  $abstract
-     * @param  object  $object
-     * @param  array   $callbacksPerType
-     *
-     * @return array
-     */
-    protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
-    {
-        $results = [];
-
-        foreach ($callbacksPerType as $type => $callbacks) {
-            if ($type === $abstract || $object instanceof $type) {
-                $results = array_merge($results, $callbacks);
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Fire an array of callbacks with an object.
-     *
-     * @param  mixed  $object
-     * @param  array  $callbacks
-     * @return void
-     */
-    protected function fireCallbackArray($object, array $callbacks)
-    {
-        foreach ($callbacks as $callback) {
-            $callback($object, $this);
-        }
-    }
-
-    /**
-     * Get the container's bindings.
-     *
-     * @return array
-     */
-    public function getBindings()
-    {
-        return $this->bindings;
-    }
-
-    /**
-     * Get the alias for an abstract if available.
-     *
-     * @param  string  $abstract
-     * @return string
-     *
-     * @throws \LogicException
-     */
-    public function getAlias($abstract)
-    {
-        if (! isset($this->aliases[$abstract])) {
-            return $abstract;
-        }
-
-        if ($this->aliases[$abstract] === $abstract) {
-            throw new LogicException("[{$abstract}] is aliased to itself.");
-        }
-
-        return $this->getAlias($this->aliases[$abstract]);
-    }
-
-    /**
-     * Get the extender callbacks for a given type.
-     *
-     * @param  string  $abstract
-     * @return array
-     */
-    protected function getExtenders($abstract)
-    {
-        $abstract = $this->getAlias($abstract);
-
-        if (isset($this->extenders[$abstract])) {
-            return $this->extenders[$abstract];
-        }
-
-        return [];
-    }
-
-    /**
-     * Remove all of the extender callbacks for a given type.
-     *
-     * @param  string  $abstract
-     * @return void
-     */
-    public function forgetExtenders($abstract)
-    {
-        unset($this->extenders[$this->getAlias($abstract)]);
-    }
-
-    /**
-     * Drop all of the stale instances and aliases.
-     *
-     * @param  string  $abstract
-     * @return void
-     */
-    protected function dropStaleInstances($abstract)
-    {
-        unset($this->instances[$abstract], $this->aliases[$abstract]);
-    }
-
-    /**
-     * Remove a resolved instance from the instance cache.
-     *
-     * @param  string  $abstract
-     * @return void
-     */
-    public function forgetInstance($abstract)
-    {
-        unset($this->instances[$abstract]);
-    }
-
-    /**
-     * Clear all of the instances from the container.
-     *
-     * @return void
-     */
-    public function forgetInstances()
-    {
-        $this->instances = [];
-    }
-
-    /**
-     * Flush the container of all bindings and resolved instances.
-     *
-     * @return void
-     */
-    public function flush()
-    {
-        $this->aliases = [];
-        $this->resolved = [];
-        $this->bindings = [];
-        $this->instances = [];
-        $this->abstractAliases = [];
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Set the shared instance of the container.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\Container|null  $container
-     * @return static
-     */
-    public static function setInstance(ContainerContract $container = null)
-    {
-        return static::$instance = $container;
-    }
-
-    /**
-     * Determine if a given offset exists.
-     *
-     * @param  string  $key
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return $this->bound($key);
-    }
-
-    /**
-     * Get the value at a given offset.
-     *
-     * @param  string  $key
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        return $this->make($key);
-    }
-
-    /**
-     * Set the value at a given offset.
-     *
-     * @param  string  $key
-     * @param  mixed   $value
-     * @return void
-     */
-    public function offsetSet($key, $value)
-    {
-        $this->bind($key, $value instanceof Closure ? $value : function () use ($value) {
-            return $value;
-        });
-    }
-
-    /**
-     * Unset the value at a given offset.
-     *
-     * @param  string  $key
-     * @return void
-     */
-    public function offsetUnset($key)
-    {
-        unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
-    }
-
-    /**
-     * Dynamically access container services.
-     *
-     * @param  string  $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        return $this[$key];
-    }
-
-    /**
-     * Dynamically set container services.
-     *
-     * @param  string  $key
-     * @param  mixed   $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $this[$key] = $value;
-    }
+	/**
+	 * The current globally available container (if any).
+	 *
+	 * @var static
+	 */
+	protected static $instance;
+
+	/**
+	 * An array of the types that have been resolved.
+	 *
+	 * @var array
+	 */
+	protected $resolved = [];
+
+	/**
+	 * The container's bindings.
+	 *
+	 * @var array
+	 */
+	protected $bindings = [];
+
+	/**
+	 * The container's method bindings.
+	 *
+	 * @var array
+	 */
+	protected $methodBindings = [];
+
+	/**
+	 * The container's shared instances.
+	 *
+	 * @var array
+	 */
+	protected $instances = [];
+
+	/**
+	 * The registered type aliases.
+	 *
+	 * @var array
+	 */
+	protected $aliases = [];
+
+	/**
+	 * The registered aliases keyed by the abstract name.
+	 *
+	 * @var array
+	 */
+	protected $abstractAliases = [];
+
+	/**
+	 * The extension closures for services.
+	 *
+	 * @var array
+	 */
+	protected $extenders = [];
+
+	/**
+	 * All of the registered tags.
+	 *
+	 * @var array
+	 */
+	protected $tags = [];
+
+	/**
+	 * The stack of concretions currently being built.
+	 *
+	 * @var array
+	 */
+	protected $buildStack = [];
+
+	/**
+	 * The parameter override stack.
+	 *
+	 * @var array
+	 */
+	protected $with = [];
+
+	/**
+	 * The contextual binding map.
+	 *
+	 * @var array
+	 */
+	public $contextual = [];
+
+	/**
+	 * All of the registered rebound callbacks.
+	 *
+	 * @var array
+	 */
+	protected $reboundCallbacks = [];
+
+	/**
+	 * All of the global resolving callbacks.
+	 *
+	 * @var array
+	 */
+	protected $globalResolvingCallbacks = [];
+
+	/**
+	 * All of the global after resolving callbacks.
+	 *
+	 * @var array
+	 */
+	protected $globalAfterResolvingCallbacks = [];
+
+	/**
+	 * All of the resolving callbacks by class type.
+	 *
+	 * @var array
+	 */
+	protected $resolvingCallbacks = [];
+
+	/**
+	 * All of the after resolving callbacks by class type.
+	 *
+	 * @var array
+	 */
+	protected $afterResolvingCallbacks = [];
+
+	/**
+	 * Define a contextual binding.
+	 *
+	 * @param  string  $concrete
+	 * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\ContextualBindingBuilder
+	 */
+	public function when($concrete)
+	{
+		return new ContextualBindingBuilder($this, $this->getAlias($concrete));
+	}
+
+	/**
+	 * Determine if the given abstract type has been bound.
+	 *
+	 * @param  string  $abstract
+	 * @return bool
+	 */
+	public function bound($abstract)
+	{
+		return isset($this->bindings[$abstract]) ||
+			   isset($this->instances[$abstract]) ||
+			   $this->isAlias($abstract);
+	}
+
+	/**
+	 * Determine if the given abstract type has been resolved.
+	 *
+	 * @param  string  $abstract
+	 * @return bool
+	 */
+	public function resolved($abstract)
+	{
+		if ($this->isAlias($abstract)) {
+			$abstract = $this->getAlias($abstract);
+		}
+
+		return isset($this->resolved[$abstract]) ||
+			   isset($this->instances[$abstract]);
+	}
+
+	/**
+	 * Determine if a given type is shared.
+	 *
+	 * @param  string  $abstract
+	 * @return bool
+	 */
+	public function isShared($abstract)
+	{
+		return isset($this->instances[$abstract]) ||
+			  (isset($this->bindings[$abstract]['shared']) &&
+			   $this->bindings[$abstract]['shared'] === true);
+	}
+
+	/**
+	 * Determine if a given string is an alias.
+	 *
+	 * @param  string  $name
+	 * @return bool
+	 */
+	public function isAlias($name)
+	{
+		return isset($this->aliases[$name]);
+	}
+
+	/**
+	 * Register a binding with the container.
+	 *
+	 * @param  string|array  $abstract
+	 * @param  \Closure|string|null  $concrete
+	 * @param  bool  $shared
+	 * @return void
+	 */
+	public function bind($abstract, $concrete = null, $shared = false)
+	{
+		// If no concrete type was given, we will simply set the concrete type to the
+		// abstract type. After that, the concrete type to be registered as shared
+		// without being forced to state their classes in both of the parameters.
+		$this->dropStaleInstances($abstract);
+
+		if (is_null($concrete)) {
+			$concrete = $abstract;
+		}
+
+		// If the factory is not a Closure, it means it is just a class name which is
+		// bound into this container to the abstract type and we will just wrap it
+		// up inside its own Closure to give us more convenience when extending.
+		if (! $concrete instanceof Closure) {
+			$concrete = $this->getClosure($abstract, $concrete);
+		}
+
+		$this->bindings[$abstract] = compact('concrete', 'shared');
+
+		// If the abstract type was already resolved in this container we'll fire the
+		// rebound listener so that any objects which have already gotten resolved
+		// can have their copy of the object updated via the listener callbacks.
+		if ($this->resolved($abstract)) {
+			$this->rebound($abstract);
+		}
+	}
+
+	/**
+	 * Get the Closure to be used when building a type.
+	 *
+	 * @param  string  $abstract
+	 * @param  string  $concrete
+	 * @return \Closure
+	 */
+	protected function getClosure($abstract, $concrete)
+	{
+		return function ($container, $parameters = []) use ($abstract, $concrete) {
+			if ($abstract == $concrete) {
+				return $container->build($concrete);
+			}
+
+			return $container->makeWith($concrete, $parameters);
+		};
+	}
+
+	/**
+	 * Determine if the container has a method binding.
+	 *
+	 * @param  string  $method
+	 * @return bool
+	 */
+	public function hasMethodBinding($method)
+	{
+		return isset($this->methodBindings[$method]);
+	}
+
+	/**
+	 * Bind a callback to resolve with Container::call.
+	 *
+	 * @param  string  $method
+	 * @param  \Closure  $callback
+	 * @return void
+	 */
+	public function bindMethod($method, $callback)
+	{
+		$this->methodBindings[$method] = $callback;
+	}
+
+	/**
+	 * Get the method binding for the given method.
+	 *
+	 * @param  string  $method
+	 * @param  mixed  $instance
+	 * @return mixed
+	 */
+	public function callMethodBinding($method, $instance)
+	{
+		return call_user_func($this->methodBindings[$method], $instance, $this);
+	}
+
+	/**
+	 * Add a contextual binding to the container.
+	 *
+	 * @param  string  $concrete
+	 * @param  string  $abstract
+	 * @param  \Closure|string  $implementation
+	 * @return void
+	 */
+	public function addContextualBinding($concrete, $abstract, $implementation)
+	{
+		$this->contextual[$concrete][$this->getAlias($abstract)] = $implementation;
+	}
+
+	/**
+	 * Register a binding if it hasn't already been registered.
+	 *
+	 * @param  string  $abstract
+	 * @param  \Closure|string|null  $concrete
+	 * @param  bool  $shared
+	 * @return void
+	 */
+	public function bindIf($abstract, $concrete = null, $shared = false)
+	{
+		if (! $this->bound($abstract)) {
+			$this->bind($abstract, $concrete, $shared);
+		}
+	}
+
+	/**
+	 * Register a shared binding in the container.
+	 *
+	 * @param  string|array  $abstract
+	 * @param  \Closure|string|null  $concrete
+	 * @return void
+	 */
+	public function singleton($abstract, $concrete = null)
+	{
+		$this->bind($abstract, $concrete, true);
+	}
+
+	/**
+	 * "Extend" an abstract type in the container.
+	 *
+	 * @param  string    $abstract
+	 * @param  \Closure  $closure
+	 * @return void
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function extend($abstract, Closure $closure)
+	{
+		$abstract = $this->getAlias($abstract);
+
+		if (isset($this->instances[$abstract])) {
+			$this->instances[$abstract] = $closure($this->instances[$abstract], $this);
+
+			$this->rebound($abstract);
+		} else {
+			$this->extenders[$abstract][] = $closure;
+
+			if ($this->resolved($abstract)) {
+				$this->rebound($abstract);
+			}
+		}
+	}
+
+	/**
+	 * Register an existing instance as shared in the container.
+	 *
+	 * @param  string  $abstract
+	 * @param  mixed   $instance
+	 * @return void
+	 */
+	public function instance($abstract, $instance)
+	{
+		$this->removeAbstractAlias($abstract);
+
+		$isBound = $this->bound($abstract);
+
+		unset($this->aliases[$abstract]);
+
+		// We'll check to determine if this type has been bound before, and if it has
+		// we will fire the rebound callbacks registered with the container and it
+		// can be updated with consuming classes that have gotten resolved here.
+		$this->instances[$abstract] = $instance;
+
+		if ($isBound) {
+			$this->rebound($abstract);
+		}
+	}
+
+	/**
+	 * Remove an alias from the contextual binding alias cache.
+	 *
+	 * @param  string  $searched
+	 * @return void
+	 */
+	protected function removeAbstractAlias($searched)
+	{
+		if (! isset($this->aliases[$searched])) {
+			return;
+		}
+
+		foreach ($this->abstractAliases as $abstract => $aliases) {
+			foreach ($aliases as $index => $alias) {
+				if ($alias == $searched) {
+					unset($this->abstractAliases[$abstract][$index]);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Assign a set of tags to a given binding.
+	 *
+	 * @param  array|string  $abstracts
+	 * @param  array|mixed   ...$tags
+	 * @return void
+	 */
+	public function tag($abstracts, $tags)
+	{
+		$tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
+
+		foreach ($tags as $tag) {
+			if (! isset($this->tags[$tag])) {
+				$this->tags[$tag] = [];
+			}
+
+			foreach ((array) $abstracts as $abstract) {
+				$this->tags[$tag][] = $abstract;
+			}
+		}
+	}
+
+	/**
+	 * Resolve all of the bindings for a given tag.
+	 *
+	 * @param  string  $tag
+	 * @return array
+	 */
+	public function tagged($tag)
+	{
+		$results = [];
+
+		if (isset($this->tags[$tag])) {
+			foreach ($this->tags[$tag] as $abstract) {
+				$results[] = $this->make($abstract);
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Alias a type to a different name.
+	 *
+	 * @param  string  $abstract
+	 * @param  string  $alias
+	 * @return void
+	 */
+	public function alias($abstract, $alias)
+	{
+		$this->aliases[$alias] = $abstract;
+
+		$this->abstractAliases[$abstract][] = $alias;
+	}
+
+	/**
+	 * Bind a new callback to an abstract's rebind event.
+	 *
+	 * @param  string    $abstract
+	 * @param  \Closure  $callback
+	 * @return mixed
+	 */
+	public function rebinding($abstract, Closure $callback)
+	{
+		$this->reboundCallbacks[$abstract = $this->getAlias($abstract)][] = $callback;
+
+		if ($this->bound($abstract)) {
+			return $this->make($abstract);
+		}
+	}
+
+	/**
+	 * Refresh an instance on the given target and method.
+	 *
+	 * @param  string  $abstract
+	 * @param  mixed   $target
+	 * @param  string  $method
+	 * @return mixed
+	 */
+	public function refresh($abstract, $target, $method)
+	{
+		return $this->rebinding($abstract, function ($app, $instance) use ($target, $method) {
+			$target->{$method}($instance);
+		});
+	}
+
+	/**
+	 * Fire the "rebound" callbacks for the given abstract type.
+	 *
+	 * @param  string  $abstract
+	 * @return void
+	 */
+	protected function rebound($abstract)
+	{
+		$instance = $this->make($abstract);
+
+		foreach ($this->getReboundCallbacks($abstract) as $callback) {
+			call_user_func($callback, $this, $instance);
+		}
+	}
+
+	/**
+	 * Get the rebound callbacks for a given type.
+	 *
+	 * @param  string  $abstract
+	 * @return array
+	 */
+	protected function getReboundCallbacks($abstract)
+	{
+		if (isset($this->reboundCallbacks[$abstract])) {
+			return $this->reboundCallbacks[$abstract];
+		}
+
+		return [];
+	}
+
+	/**
+	 * Wrap the given closure such that its dependencies will be injected when executed.
+	 *
+	 * @param  \Closure  $callback
+	 * @param  array  $parameters
+	 * @return \Closure
+	 */
+	public function wrap(Closure $callback, array $parameters = [])
+	{
+		return function () use ($callback, $parameters) {
+			return $this->call($callback, $parameters);
+		};
+	}
+
+	/**
+	 * Call the given Closure / class@method and inject its dependencies.
+	 *
+	 * @param  callable|string  $callback
+	 * @param  array  $parameters
+	 * @param  string|null  $defaultMethod
+	 * @return mixed
+	 */
+	public function call($callback, array $parameters = [], $defaultMethod = null)
+	{
+		return BoundMethod::call($this, $callback, $parameters, $defaultMethod);
+	}
+
+	/**
+	 * Get a closure to resolve the given type from the container.
+	 *
+	 * @param  string  $abstract
+	 * @return \Closure
+	 */
+	public function factory($abstract)
+	{
+		return function () use ($abstract) {
+			return $this->make($abstract);
+		};
+	}
+
+	/**
+	 * Resolve the given type with the given parameter overrides.
+	 *
+	 * @param  string  $abstract
+	 * @param  array  $parameters
+	 * @return mixed
+	 */
+	public function makeWith($abstract, array $parameters)
+	{
+		return $this->resolve($abstract, $parameters);
+	}
+
+	/**
+	 * Resolve the given type from the container.
+	 *
+	 * @param  string  $abstract
+	 * @return mixed
+	 */
+	public function make($abstract)
+	{
+		return $this->resolve($abstract);
+	}
+
+	/**
+	 * Resolve the given type from the container.
+	 *
+	 * @param  string  $abstract
+	 * @param  array  $parameters
+	 * @return mixed
+	 */
+	protected function resolve($abstract, $parameters = [])
+	{
+		$abstract = $this->getAlias($abstract);
+
+		$needsContextualBuild = ! empty($parameters) || ! is_null(
+			$this->getContextualConcrete($abstract)
+		);
+
+		// If an instance of the type is currently being managed as a singleton we'll
+		// just return an existing instance instead of instantiating new instances
+		// so the developer can keep using the same objects instance every time.
+		if (isset($this->instances[$abstract]) && ! $needsContextualBuild) {
+			return $this->instances[$abstract];
+		}
+
+		$this->with[] = $parameters;
+
+		$concrete = $this->getConcrete($abstract);
+
+		// We're ready to instantiate an instance of the concrete type registered for
+		// the binding. This will instantiate the types, as well as resolve any of
+		// its "nested" dependencies recursively until all have gotten resolved.
+		if ($this->isBuildable($concrete, $abstract)) {
+			$object = $this->build($concrete);
+		} else {
+			$object = $this->make($concrete);
+		}
+
+		// If we defined any extenders for this type, we'll need to spin through them
+		// and apply them to the object being built. This allows for the extension
+		// of services, such as changing configuration or decorating the object.
+		foreach ($this->getExtenders($abstract) as $extender) {
+			$object = $extender($object, $this);
+		}
+
+		// If the requested type is registered as a singleton we'll want to cache off
+		// the instances in "memory" so we can return it later without creating an
+		// entirely new instance of an object on each subsequent request for it.
+		if ($this->isShared($abstract) && ! $needsContextualBuild) {
+			$this->instances[$abstract] = $object;
+		}
+
+		$this->fireResolvingCallbacks($abstract, $object);
+
+		// Before returning, we will also set the resolved flag to "true" and pop off
+		// the parameter overrides for this build. After those two things are done
+		// we will be ready to return back the fully constructed class instance.
+		$this->resolved[$abstract] = true;
+
+		array_pop($this->with);
+
+		return $object;
+	}
+
+	/**
+	 * Get the concrete type for a given abstract.
+	 *
+	 * @param  string  $abstract
+	 * @return mixed   $concrete
+	 */
+	protected function getConcrete($abstract)
+	{
+		if (! is_null($concrete = $this->getContextualConcrete($abstract))) {
+			return $concrete;
+		}
+
+		// If we don't have a registered resolver or concrete for the type, we'll just
+		// assume each type is a concrete name and will attempt to resolve it as is
+		// since the container should be able to resolve concretes automatically.
+		if (isset($this->bindings[$abstract])) {
+			return $this->bindings[$abstract]['concrete'];
+		}
+
+		return $abstract;
+	}
+
+	/**
+	 * Get the contextual concrete binding for the given abstract.
+	 *
+	 * @param  string  $abstract
+	 * @return string|null
+	 */
+	protected function getContextualConcrete($abstract)
+	{
+		if (! is_null($binding = $this->findInContextualBindings($abstract))) {
+			return $binding;
+		}
+
+		// Next we need to see if a contextual binding might be bound under an alias of the
+		// given abstract type. So, we will need to check if any aliases exist with this
+		// type and then spin through them and check for contextual bindings on these.
+		if (empty($this->abstractAliases[$abstract])) {
+			return;
+		}
+
+		foreach ($this->abstractAliases[$abstract] as $alias) {
+			if (! is_null($binding = $this->findInContextualBindings($alias))) {
+				return $binding;
+			}
+		}
+	}
+
+	/**
+	 * Find the concrete binding for the given abstract in the contextual binding array.
+	 *
+	 * @param  string  $abstract
+	 * @return string|null
+	 */
+	protected function findInContextualBindings($abstract)
+	{
+		if (isset($this->contextual[end($this->buildStack)][$abstract])) {
+			return $this->contextual[end($this->buildStack)][$abstract];
+		}
+	}
+
+	/**
+	 * Determine if the given concrete is buildable.
+	 *
+	 * @param  mixed   $concrete
+	 * @param  string  $abstract
+	 * @return bool
+	 */
+	protected function isBuildable($concrete, $abstract)
+	{
+		return $concrete === $abstract || $concrete instanceof Closure;
+	}
+
+	/**
+	 * Instantiate a concrete instance of the given type.
+	 *
+	 * @param  string  $concrete
+	 * @return mixed
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
+	 */
+	public function build($concrete)
+	{
+		// If the concrete type is actually a Closure, we will just execute it and
+		// hand back the results of the functions, which allows functions to be
+		// used as resolvers for more fine-tuned resolution of these objects.
+		if ($concrete instanceof Closure) {
+			return $concrete($this, $this->getLastParameterOverride());
+		}
+
+		$reflector = new ReflectionClass($concrete);
+
+		// If the type is not instantiable, the developer is attempting to resolve
+		// an abstract type such as an Interface of Abstract Class and there is
+		// no binding registered for the abstractions so we need to bail out.
+		if (! $reflector->isInstantiable()) {
+			return $this->notInstantiable($concrete);
+		}
+
+		$this->buildStack[] = $concrete;
+
+		$constructor = $reflector->getConstructor();
+
+		// If there are no constructors, that means there are no dependencies then
+		// we can just resolve the instances of the objects right away, without
+		// resolving any other types or dependencies out of these containers.
+		if (is_null($constructor)) {
+			array_pop($this->buildStack);
+
+			return new $concrete;
+		}
+
+		$dependencies = $constructor->getParameters();
+
+		// Once we have all the constructor's parameters we can create each of the
+		// dependency instances and then use the reflection instances to make a
+		// new instance of this class, injecting the created dependencies in.
+		$instances = $this->resolveDependencies(
+			$dependencies
+		);
+
+		array_pop($this->buildStack);
+
+		return $reflector->newInstanceArgs($instances);
+	}
+
+	/**
+	 * Resolve all of the dependencies from the ReflectionParameters.
+	 *
+	 * @param  array  $dependencies
+	 * @return array
+	 */
+	protected function resolveDependencies(array $dependencies)
+	{
+		$results = [];
+
+		foreach ($dependencies as $dependency) {
+			// If this dependency has a override for this particular build we will use
+			// that instead as the value. Otherwise, we will continue with this run
+			// of resolutions and let reflection attempt to determine the result.
+			if ($this->hasParameterOverride($dependency)) {
+				$results[] = $this->getParameterOverride($dependency);
+
+				continue;
+			}
+
+			// If the class is null, it means the dependency is a string or some other
+			// primitive type which we can not resolve since it is not a class and
+			// we will just bomb out with an error since we have no-where to go.
+			$results[] = is_null($class = $dependency->getClass())
+							? $this->resolvePrimitive($dependency)
+							: $this->resolveClass($dependency);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Determine if the given dependency has a parameter override from makeWith.
+	 *
+	 * @param  \ReflectionParameter  $dependency
+	 * @return bool
+	 */
+	protected function hasParameterOverride($dependency)
+	{
+		return array_key_exists(
+			$dependency->name, $this->getLastParameterOverride()
+		);
+	}
+
+	/**
+	 * Get a parameter override for a dependency.
+	 *
+	 * @param  \ReflectionParameter  $dependency
+	 * @return mixed
+	 */
+	protected function getParameterOverride($dependency)
+	{
+		return $this->getLastParameterOverride()[$dependency->name];
+	}
+
+	/**
+	 * Get the last parameter override.
+	 *
+	 * @return array
+	 */
+	protected function getLastParameterOverride()
+	{
+		return count($this->with) ? end($this->with) : [];
+	}
+
+	/**
+	 * Resolve a non-class hinted primitive dependency.
+	 *
+	 * @param  \ReflectionParameter  $parameter
+	 * @return mixed
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
+	 */
+	protected function resolvePrimitive(ReflectionParameter $parameter)
+	{
+		if (! is_null($concrete = $this->getContextualConcrete('$'.$parameter->name))) {
+			return $concrete instanceof Closure ? $concrete($this) : $concrete;
+		}
+
+		if ($parameter->isDefaultValueAvailable()) {
+			return $parameter->getDefaultValue();
+		}
+
+		$this->unresolvablePrimitive($parameter);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 *
+	 * @param  \ReflectionParameter  $parameter
+	 * @return mixed
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try {
+			return $this->make($parameter->getClass()->name);
+		}
+
+		// If we can not resolve the class instance, we will check to see if the value
+		// is optional, and if it is we will return the optional parameter value as
+		// the value of the dependency, similarly to how we do this with scalars.
+		catch (BindingResolutionException $e) {
+			if ($parameter->isOptional()) {
+				return $parameter->getDefaultValue();
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * Throw an exception that the concrete is not instantiable.
+	 *
+	 * @param  string  $concrete
+	 * @return void
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
+	 */
+	protected function notInstantiable($concrete)
+	{
+		if (! empty($this->buildStack)) {
+			$previous = implode(', ', $this->buildStack);
+
+			$message = "Target [$concrete] is not instantiable while building [$previous].";
+		} else {
+			$message = "Target [$concrete] is not instantiable.";
+		}
+
+		throw new BindingResolutionException($message);
+	}
+
+	/**
+	 * Throw an exception for an unresolvable primitive.
+	 *
+	 * @param  \ReflectionParameter  $parameter
+	 * @return void
+	 *
+	 * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
+	 */
+	protected function unresolvablePrimitive(ReflectionParameter $parameter)
+	{
+		$message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
+
+		throw new BindingResolutionException($message);
+	}
+
+	/**
+	 * Register a new resolving callback.
+	 *
+	 * @param  string    $abstract
+	 * @param  \Closure|null  $callback
+	 * @return void
+	 */
+	public function resolving($abstract, Closure $callback = null)
+	{
+		if (is_string($abstract)) {
+			$abstract = $this->getAlias($abstract);
+		}
+
+		if (is_null($callback) && $abstract instanceof Closure) {
+			$this->globalResolvingCallbacks[] = $abstract;
+		} else {
+			$this->resolvingCallbacks[$abstract][] = $callback;
+		}
+	}
+
+	/**
+	 * Register a new after resolving callback for all types.
+	 *
+	 * @param  string   $abstract
+	 * @param  \Closure|null $callback
+	 * @return void
+	 */
+	public function afterResolving($abstract, Closure $callback = null)
+	{
+		if (is_string($abstract)) {
+			$abstract = $this->getAlias($abstract);
+		}
+
+		if ($abstract instanceof Closure && is_null($callback)) {
+			$this->globalAfterResolvingCallbacks[] = $abstract;
+		} else {
+			$this->afterResolvingCallbacks[$abstract][] = $callback;
+		}
+	}
+
+	/**
+	 * Fire all of the resolving callbacks.
+	 *
+	 * @param  string  $abstract
+	 * @param  mixed   $object
+	 * @return void
+	 */
+	protected function fireResolvingCallbacks($abstract, $object)
+	{
+		$this->fireCallbackArray($object, $this->globalResolvingCallbacks);
+
+		$this->fireCallbackArray(
+			$object, $this->getCallbacksForType($abstract, $object, $this->resolvingCallbacks)
+		);
+
+		$this->fireAfterResolvingCallbacks($abstract, $object);
+	}
+
+	/**
+	 * Fire all of the after resolving callbacks.
+	 *
+	 * @param  string  $abstract
+	 * @param  mixed   $object
+	 * @return void
+	 */
+	protected function fireAfterResolvingCallbacks($abstract, $object)
+	{
+		$this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
+
+		$this->fireCallbackArray(
+			$object, $this->getCallbacksForType($abstract, $object, $this->afterResolvingCallbacks)
+		);
+	}
+
+	/**
+	 * Get all callbacks for a given type.
+	 *
+	 * @param  string  $abstract
+	 * @param  object  $object
+	 * @param  array   $callbacksPerType
+	 *
+	 * @return array
+	 */
+	protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
+	{
+		$results = [];
+
+		foreach ($callbacksPerType as $type => $callbacks) {
+			if ($type === $abstract || $object instanceof $type) {
+				$results = array_merge($results, $callbacks);
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Fire an array of callbacks with an object.
+	 *
+	 * @param  mixed  $object
+	 * @param  array  $callbacks
+	 * @return void
+	 */
+	protected function fireCallbackArray($object, array $callbacks)
+	{
+		foreach ($callbacks as $callback) {
+			$callback($object, $this);
+		}
+	}
+
+	/**
+	 * Get the container's bindings.
+	 *
+	 * @return array
+	 */
+	public function getBindings()
+	{
+		return $this->bindings;
+	}
+
+	/**
+	 * Get the alias for an abstract if available.
+	 *
+	 * @param  string  $abstract
+	 * @return string
+	 *
+	 * @throws \LogicException
+	 */
+	public function getAlias($abstract)
+	{
+		if (! isset($this->aliases[$abstract])) {
+			return $abstract;
+		}
+
+		if ($this->aliases[$abstract] === $abstract) {
+			throw new LogicException("[{$abstract}] is aliased to itself.");
+		}
+
+		return $this->getAlias($this->aliases[$abstract]);
+	}
+
+	/**
+	 * Get the extender callbacks for a given type.
+	 *
+	 * @param  string  $abstract
+	 * @return array
+	 */
+	protected function getExtenders($abstract)
+	{
+		$abstract = $this->getAlias($abstract);
+
+		if (isset($this->extenders[$abstract])) {
+			return $this->extenders[$abstract];
+		}
+
+		return [];
+	}
+
+	/**
+	 * Remove all of the extender callbacks for a given type.
+	 *
+	 * @param  string  $abstract
+	 * @return void
+	 */
+	public function forgetExtenders($abstract)
+	{
+		unset($this->extenders[$this->getAlias($abstract)]);
+	}
+
+	/**
+	 * Drop all of the stale instances and aliases.
+	 *
+	 * @param  string  $abstract
+	 * @return void
+	 */
+	protected function dropStaleInstances($abstract)
+	{
+		unset($this->instances[$abstract], $this->aliases[$abstract]);
+	}
+
+	/**
+	 * Remove a resolved instance from the instance cache.
+	 *
+	 * @param  string  $abstract
+	 * @return void
+	 */
+	public function forgetInstance($abstract)
+	{
+		unset($this->instances[$abstract]);
+	}
+
+	/**
+	 * Clear all of the instances from the container.
+	 *
+	 * @return void
+	 */
+	public function forgetInstances()
+	{
+		$this->instances = [];
+	}
+
+	/**
+	 * Flush the container of all bindings and resolved instances.
+	 *
+	 * @return void
+	 */
+	public function flush()
+	{
+		$this->aliases = [];
+		$this->resolved = [];
+		$this->bindings = [];
+		$this->instances = [];
+		$this->abstractAliases = [];
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * Set the shared instance of the container.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\Container|null  $container
+	 * @return static
+	 */
+	public static function setInstance(ContainerContract $container = null)
+	{
+		return static::$instance = $container;
+	}
+
+	/**
+	 * Determine if a given offset exists.
+	 *
+	 * @param  string  $key
+	 * @return bool
+	 */
+	public function offsetExists($key)
+	{
+		return $this->bound($key);
+	}
+
+	/**
+	 * Get the value at a given offset.
+	 *
+	 * @param  string  $key
+	 * @return mixed
+	 */
+	public function offsetGet($key)
+	{
+		return $this->make($key);
+	}
+
+	/**
+	 * Set the value at a given offset.
+	 *
+	 * @param  string  $key
+	 * @param  mixed   $value
+	 * @return void
+	 */
+	public function offsetSet($key, $value)
+	{
+		$this->bind($key, $value instanceof Closure ? $value : function () use ($value) {
+			return $value;
+		});
+	}
+
+	/**
+	 * Unset the value at a given offset.
+	 *
+	 * @param  string  $key
+	 * @return void
+	 */
+	public function offsetUnset($key)
+	{
+		unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
+	}
+
+	/**
+	 * Dynamically access container services.
+	 *
+	 * @param  string  $key
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		return $this[$key];
+	}
+
+	/**
+	 * Dynamically set container services.
+	 *
+	 * @param  string  $key
+	 * @param  mixed   $value
+	 * @return void
+	 */
+	public function __set($key, $value)
+	{
+		$this[$key] = $value;
+	}
 }

Spacing +254 added lines, -254 removed lines

@@ -30,112 +30,112 @@ 
      *
      * @var array
      */
-    protected $resolved = [];
+    protected $resolved = [ ];
 
     /**
      * The container's bindings.
      *
      * @var array
      */
-    protected $bindings = [];
+    protected $bindings = [ ];
 
     /**
      * The container's method bindings.
      *
      * @var array
      */
-    protected $methodBindings = [];
+    protected $methodBindings = [ ];
 
     /**
      * The container's shared instances.
      *
      * @var array
      */
-    protected $instances = [];
+    protected $instances = [ ];
 
     /**
      * The registered type aliases.
      *
      * @var array
      */
-    protected $aliases = [];
+    protected $aliases = [ ];
 
     /**
      * The registered aliases keyed by the abstract name.
      *
      * @var array
      */
-    protected $abstractAliases = [];
+    protected $abstractAliases = [ ];
 
     /**
      * The extension closures for services.
      *
      * @var array
      */
-    protected $extenders = [];
+    protected $extenders = [ ];
 
     /**
      * All of the registered tags.
      *
      * @var array
      */
-    protected $tags = [];
+    protected $tags = [ ];
 
     /**
      * The stack of concretions currently being built.
      *
      * @var array
      */
-    protected $buildStack = [];
+    protected $buildStack = [ ];
 
     /**
      * The parameter override stack.
      *
      * @var array
      */
-    protected $with = [];
+    protected $with = [ ];
 
     /**
      * The contextual binding map.
      *
      * @var array
      */
-    public $contextual = [];
+    public $contextual = [ ];
 
     /**
      * All of the registered rebound callbacks.
      *
      * @var array
      */
-    protected $reboundCallbacks = [];
+    protected $reboundCallbacks = [ ];
 
     /**
      * All of the global resolving callbacks.
      *
      * @var array
      */
-    protected $globalResolvingCallbacks = [];
+    protected $globalResolvingCallbacks = [ ];
 
     /**
      * All of the global after resolving callbacks.
      *
      * @var array
      */
-    protected $globalAfterResolvingCallbacks = [];
+    protected $globalAfterResolvingCallbacks = [ ];
 
     /**
      * All of the resolving callbacks by class type.
      *
      * @var array
      */
-    protected $resolvingCallbacks = [];
+    protected $resolvingCallbacks = [ ];
 
     /**
      * All of the after resolving callbacks by class type.
      *
      * @var array
      */
-    protected $afterResolvingCallbacks = [];
+    protected $afterResolvingCallbacks = [ ];
 
     /**
      * Define a contextual binding.
@@ -143,9 +143,9 @@ 
      * @param  string  $concrete
      * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\ContextualBindingBuilder
      */
-    public function when($concrete)
+    public function when( $concrete )
     {
-        return new ContextualBindingBuilder($this, $this->getAlias($concrete));
+        return new ContextualBindingBuilder( $this, $this->getAlias( $concrete ) );
     }
 
     /**
@@ -154,11 +154,11 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    public function bound($abstract)
+    public function bound( $abstract )
     {
-        return isset($this->bindings[$abstract]) ||
-               isset($this->instances[$abstract]) ||
-               $this->isAlias($abstract);
+        return isset( $this->bindings[ $abstract ] ) ||
+               isset( $this->instances[ $abstract ] ) ||
+               $this->isAlias( $abstract );
     }
 
     /**
@@ -167,14 +167,14 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    public function resolved($abstract)
+    public function resolved( $abstract )
     {
-        if ($this->isAlias($abstract)) {
-            $abstract = $this->getAlias($abstract);
+        if ( $this->isAlias( $abstract ) ) {
+            $abstract = $this->getAlias( $abstract );
         }
 
-        return isset($this->resolved[$abstract]) ||
-               isset($this->instances[$abstract]);
+        return isset( $this->resolved[ $abstract ] ) ||
+               isset( $this->instances[ $abstract ] );
     }
 
     /**
@@ -183,11 +183,11 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    public function isShared($abstract)
+    public function isShared( $abstract )
     {
-        return isset($this->instances[$abstract]) ||
-              (isset($this->bindings[$abstract]['shared']) &&
-               $this->bindings[$abstract]['shared'] === true);
+        return isset( $this->instances[ $abstract ] ) ||
+              ( isset( $this->bindings[ $abstract ][ 'shared' ] ) &&
+               $this->bindings[ $abstract ][ 'shared' ] === true );
     }
 
     /**
@@ -196,9 +196,9 @@ 
      * @param  string  $name
      * @return bool
      */
-    public function isAlias($name)
+    public function isAlias( $name )
     {
-        return isset($this->aliases[$name]);
+        return isset( $this->aliases[ $name ] );
     }
 
     /**
@@ -209,31 +209,31 @@ 
      * @param  bool  $shared
      * @return void
      */
-    public function bind($abstract, $concrete = null, $shared = false)
+    public function bind( $abstract, $concrete = null, $shared = false )
     {
         // If no concrete type was given, we will simply set the concrete type to the
         // abstract type. After that, the concrete type to be registered as shared
         // without being forced to state their classes in both of the parameters.
-        $this->dropStaleInstances($abstract);
+        $this->dropStaleInstances( $abstract );
 
-        if (is_null($concrete)) {
+        if ( is_null( $concrete ) ) {
             $concrete = $abstract;
         }
 
         // If the factory is not a Closure, it means it is just a class name which is
         // bound into this container to the abstract type and we will just wrap it
         // up inside its own Closure to give us more convenience when extending.
-        if (! $concrete instanceof Closure) {
-            $concrete = $this->getClosure($abstract, $concrete);
+        if ( ! $concrete instanceof Closure ) {
+            $concrete = $this->getClosure( $abstract, $concrete );
         }
 
-        $this->bindings[$abstract] = compact('concrete', 'shared');
+        $this->bindings[ $abstract ] = compact( 'concrete', 'shared' );
 
         // If the abstract type was already resolved in this container we'll fire the
         // rebound listener so that any objects which have already gotten resolved
         // can have their copy of the object updated via the listener callbacks.
-        if ($this->resolved($abstract)) {
-            $this->rebound($abstract);
+        if ( $this->resolved( $abstract ) ) {
+            $this->rebound( $abstract );
         }
     }
 
@@ -244,14 +244,14 @@ 
      * @param  string  $concrete
      * @return \Closure
      */
-    protected function getClosure($abstract, $concrete)
+    protected function getClosure( $abstract, $concrete )
     {
-        return function ($container, $parameters = []) use ($abstract, $concrete) {
-            if ($abstract == $concrete) {
-                return $container->build($concrete);
+        return function( $container, $parameters = [ ] ) use ( $abstract, $concrete ) {
+            if ( $abstract == $concrete ) {
+                return $container->build( $concrete );
             }
 
-            return $container->makeWith($concrete, $parameters);
+            return $container->makeWith( $concrete, $parameters );
         };
     }
 
@@ -261,9 +261,9 @@ 
      * @param  string  $method
      * @return bool
      */
-    public function hasMethodBinding($method)
+    public function hasMethodBinding( $method )
     {
-        return isset($this->methodBindings[$method]);
+        return isset( $this->methodBindings[ $method ] );
     }
 
     /**
@@ -273,9 +273,9 @@ 
      * @param  \Closure  $callback
      * @return void
      */
-    public function bindMethod($method, $callback)
+    public function bindMethod( $method, $callback )
     {
-        $this->methodBindings[$method] = $callback;
+        $this->methodBindings[ $method ] = $callback;
     }
 
     /**
@@ -285,9 +285,9 @@ 
      * @param  mixed  $instance
      * @return mixed
      */
-    public function callMethodBinding($method, $instance)
+    public function callMethodBinding( $method, $instance )
     {
-        return call_user_func($this->methodBindings[$method], $instance, $this);
+        return call_user_func( $this->methodBindings[ $method ], $instance, $this );
     }
 
     /**
@@ -298,9 +298,9 @@ 
      * @param  \Closure|string  $implementation
      * @return void
      */
-    public function addContextualBinding($concrete, $abstract, $implementation)
+    public function addContextualBinding( $concrete, $abstract, $implementation )
     {
-        $this->contextual[$concrete][$this->getAlias($abstract)] = $implementation;
+        $this->contextual[ $concrete ][ $this->getAlias( $abstract ) ] = $implementation;
     }
 
     /**
@@ -311,10 +311,10 @@ 
      * @param  bool  $shared
      * @return void
      */
-    public function bindIf($abstract, $concrete = null, $shared = false)
+    public function bindIf( $abstract, $concrete = null, $shared = false )
     {
-        if (! $this->bound($abstract)) {
-            $this->bind($abstract, $concrete, $shared);
+        if ( ! $this->bound( $abstract ) ) {
+            $this->bind( $abstract, $concrete, $shared );
         }
     }
 
@@ -325,9 +325,9 @@ 
      * @param  \Closure|string|null  $concrete
      * @return void
      */
-    public function singleton($abstract, $concrete = null)
+    public function singleton( $abstract, $concrete = null )
     {
-        $this->bind($abstract, $concrete, true);
+        $this->bind( $abstract, $concrete, true );
     }
 
     /**
@@ -339,19 +339,19 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function extend($abstract, Closure $closure)
+    public function extend( $abstract, Closure $closure )
     {
-        $abstract = $this->getAlias($abstract);
+        $abstract = $this->getAlias( $abstract );
 
-        if (isset($this->instances[$abstract])) {
-            $this->instances[$abstract] = $closure($this->instances[$abstract], $this);
+        if ( isset( $this->instances[ $abstract ] ) ) {
+            $this->instances[ $abstract ] = $closure( $this->instances[ $abstract ], $this );
 
-            $this->rebound($abstract);
+            $this->rebound( $abstract );
         } else {
-            $this->extenders[$abstract][] = $closure;
+            $this->extenders[ $abstract ][ ] = $closure;
 
-            if ($this->resolved($abstract)) {
-                $this->rebound($abstract);
+            if ( $this->resolved( $abstract ) ) {
+                $this->rebound( $abstract );
             }
         }
     }
@@ -363,21 +363,21 @@ 
      * @param  mixed   $instance
      * @return void
      */
-    public function instance($abstract, $instance)
+    public function instance( $abstract, $instance )
     {
-        $this->removeAbstractAlias($abstract);
+        $this->removeAbstractAlias( $abstract );
 
-        $isBound = $this->bound($abstract);
+        $isBound = $this->bound( $abstract );
 
-        unset($this->aliases[$abstract]);
+        unset( $this->aliases[ $abstract ] );
 
         // We'll check to determine if this type has been bound before, and if it has
         // we will fire the rebound callbacks registered with the container and it
         // can be updated with consuming classes that have gotten resolved here.
-        $this->instances[$abstract] = $instance;
+        $this->instances[ $abstract ] = $instance;
 
-        if ($isBound) {
-            $this->rebound($abstract);
+        if ( $isBound ) {
+            $this->rebound( $abstract );
         }
     }
 
@@ -387,16 +387,16 @@ 
      * @param  string  $searched
      * @return void
      */
-    protected function removeAbstractAlias($searched)
+    protected function removeAbstractAlias( $searched )
     {
-        if (! isset($this->aliases[$searched])) {
+        if ( ! isset( $this->aliases[ $searched ] ) ) {
             return;
         }
 
-        foreach ($this->abstractAliases as $abstract => $aliases) {
-            foreach ($aliases as $index => $alias) {
-                if ($alias == $searched) {
-                    unset($this->abstractAliases[$abstract][$index]);
+        foreach ( $this->abstractAliases as $abstract => $aliases ) {
+            foreach ( $aliases as $index => $alias ) {
+                if ( $alias == $searched ) {
+                    unset( $this->abstractAliases[ $abstract ][ $index ] );
                 }
             }
         }
@@ -409,17 +409,17 @@ 
      * @param  array|mixed   ...$tags
      * @return void
      */
-    public function tag($abstracts, $tags)
+    public function tag( $abstracts, $tags )
     {
-        $tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
+        $tags = is_array( $tags ) ? $tags : array_slice( func_get_args(), 1 );
 
-        foreach ($tags as $tag) {
-            if (! isset($this->tags[$tag])) {
-                $this->tags[$tag] = [];
+        foreach ( $tags as $tag ) {
+            if ( ! isset( $this->tags[ $tag ] ) ) {
+                $this->tags[ $tag ] = [ ];
             }
 
-            foreach ((array) $abstracts as $abstract) {
-                $this->tags[$tag][] = $abstract;
+            foreach ( (array)$abstracts as $abstract ) {
+                $this->tags[ $tag ][ ] = $abstract;
             }
         }
     }
@@ -430,13 +430,13 @@ 
      * @param  string  $tag
      * @return array
      */
-    public function tagged($tag)
+    public function tagged( $tag )
     {
-        $results = [];
+        $results = [ ];
 
-        if (isset($this->tags[$tag])) {
-            foreach ($this->tags[$tag] as $abstract) {
-                $results[] = $this->make($abstract);
+        if ( isset( $this->tags[ $tag ] ) ) {
+            foreach ( $this->tags[ $tag ] as $abstract ) {
+                $results[ ] = $this->make( $abstract );
             }
         }
 
@@ -450,11 +450,11 @@ 
      * @param  string  $alias
      * @return void
      */
-    public function alias($abstract, $alias)
+    public function alias( $abstract, $alias )
     {
-        $this->aliases[$alias] = $abstract;
+        $this->aliases[ $alias ] = $abstract;
 
-        $this->abstractAliases[$abstract][] = $alias;
+        $this->abstractAliases[ $abstract ][ ] = $alias;
     }
 
     /**
@@ -464,12 +464,12 @@ 
      * @param  \Closure  $callback
      * @return mixed
      */
-    public function rebinding($abstract, Closure $callback)
+    public function rebinding( $abstract, Closure $callback )
     {
-        $this->reboundCallbacks[$abstract = $this->getAlias($abstract)][] = $callback;
+        $this->reboundCallbacks[ $abstract = $this->getAlias( $abstract ) ][ ] = $callback;
 
-        if ($this->bound($abstract)) {
-            return $this->make($abstract);
+        if ( $this->bound( $abstract ) ) {
+            return $this->make( $abstract );
         }
     }
 
@@ -481,10 +481,10 @@ 
      * @param  string  $method
      * @return mixed
      */
-    public function refresh($abstract, $target, $method)
+    public function refresh( $abstract, $target, $method )
     {
-        return $this->rebinding($abstract, function ($app, $instance) use ($target, $method) {
-            $target->{$method}($instance);
+        return $this->rebinding( $abstract, function( $app, $instance ) use ( $target, $method ) {
+            $target->{$method}( $instance );
         });
     }
 
@@ -494,12 +494,12 @@ 
      * @param  string  $abstract
      * @return void
      */
-    protected function rebound($abstract)
+    protected function rebound( $abstract )
     {
-        $instance = $this->make($abstract);
+        $instance = $this->make( $abstract );
 
-        foreach ($this->getReboundCallbacks($abstract) as $callback) {
-            call_user_func($callback, $this, $instance);
+        foreach ( $this->getReboundCallbacks( $abstract ) as $callback ) {
+            call_user_func( $callback, $this, $instance );
         }
     }
 
@@ -509,13 +509,13 @@ 
      * @param  string  $abstract
      * @return array
      */
-    protected function getReboundCallbacks($abstract)
+    protected function getReboundCallbacks( $abstract )
     {
-        if (isset($this->reboundCallbacks[$abstract])) {
-            return $this->reboundCallbacks[$abstract];
+        if ( isset( $this->reboundCallbacks[ $abstract ] ) ) {
+            return $this->reboundCallbacks[ $abstract ];
         }
 
-        return [];
+        return [ ];
     }
 
     /**
@@ -525,10 +525,10 @@ 
      * @param  array  $parameters
      * @return \Closure
      */
-    public function wrap(Closure $callback, array $parameters = [])
+    public function wrap( Closure $callback, array $parameters = [ ] )
     {
-        return function () use ($callback, $parameters) {
-            return $this->call($callback, $parameters);
+        return function() use ( $callback, $parameters ) {
+            return $this->call( $callback, $parameters );
         };
     }
 
@@ -540,9 +540,9 @@ 
      * @param  string|null  $defaultMethod
      * @return mixed
      */
-    public function call($callback, array $parameters = [], $defaultMethod = null)
+    public function call( $callback, array $parameters = [ ], $defaultMethod = null )
     {
-        return BoundMethod::call($this, $callback, $parameters, $defaultMethod);
+        return BoundMethod::call( $this, $callback, $parameters, $defaultMethod );
     }
 
     /**
@@ -551,10 +551,10 @@ 
      * @param  string  $abstract
      * @return \Closure
      */
-    public function factory($abstract)
+    public function factory( $abstract )
     {
-        return function () use ($abstract) {
-            return $this->make($abstract);
+        return function() use ( $abstract ) {
+            return $this->make( $abstract );
         };
     }
 
@@ -565,9 +565,9 @@ 
      * @param  array  $parameters
      * @return mixed
      */
-    public function makeWith($abstract, array $parameters)
+    public function makeWith( $abstract, array $parameters )
     {
-        return $this->resolve($abstract, $parameters);
+        return $this->resolve( $abstract, $parameters );
     }
 
     /**
@@ -576,9 +576,9 @@ 
      * @param  string  $abstract
      * @return mixed
      */
-    public function make($abstract)
+    public function make( $abstract )
     {
-        return $this->resolve($abstract);
+        return $this->resolve( $abstract );
     }
 
     /**
@@ -588,56 +588,56 @@ 
      * @param  array  $parameters
      * @return mixed
      */
-    protected function resolve($abstract, $parameters = [])
+    protected function resolve( $abstract, $parameters = [ ] )
     {
-        $abstract = $this->getAlias($abstract);
+        $abstract = $this->getAlias( $abstract );
 
-        $needsContextualBuild = ! empty($parameters) || ! is_null(
-            $this->getContextualConcrete($abstract)
+        $needsContextualBuild = ! empty( $parameters ) || ! is_null(
+            $this->getContextualConcrete( $abstract )
         );
 
         // If an instance of the type is currently being managed as a singleton we'll
         // just return an existing instance instead of instantiating new instances
         // so the developer can keep using the same objects instance every time.
-        if (isset($this->instances[$abstract]) && ! $needsContextualBuild) {
-            return $this->instances[$abstract];
+        if ( isset( $this->instances[ $abstract ] ) && ! $needsContextualBuild ) {
+            return $this->instances[ $abstract ];
         }
 
-        $this->with[] = $parameters;
+        $this->with[ ] = $parameters;
 
-        $concrete = $this->getConcrete($abstract);
+        $concrete = $this->getConcrete( $abstract );
 
         // We're ready to instantiate an instance of the concrete type registered for
         // the binding. This will instantiate the types, as well as resolve any of
         // its "nested" dependencies recursively until all have gotten resolved.
-        if ($this->isBuildable($concrete, $abstract)) {
-            $object = $this->build($concrete);
+        if ( $this->isBuildable( $concrete, $abstract ) ) {
+            $object = $this->build( $concrete );
         } else {
-            $object = $this->make($concrete);
+            $object = $this->make( $concrete );
         }
 
         // If we defined any extenders for this type, we'll need to spin through them
         // and apply them to the object being built. This allows for the extension
         // of services, such as changing configuration or decorating the object.
-        foreach ($this->getExtenders($abstract) as $extender) {
-            $object = $extender($object, $this);
+        foreach ( $this->getExtenders( $abstract ) as $extender ) {
+            $object = $extender( $object, $this );
         }
 
         // If the requested type is registered as a singleton we'll want to cache off
         // the instances in "memory" so we can return it later without creating an
         // entirely new instance of an object on each subsequent request for it.
-        if ($this->isShared($abstract) && ! $needsContextualBuild) {
-            $this->instances[$abstract] = $object;
+        if ( $this->isShared( $abstract ) && ! $needsContextualBuild ) {
+            $this->instances[ $abstract ] = $object;
         }
 
-        $this->fireResolvingCallbacks($abstract, $object);
+        $this->fireResolvingCallbacks( $abstract, $object );
 
         // Before returning, we will also set the resolved flag to "true" and pop off
         // the parameter overrides for this build. After those two things are done
         // we will be ready to return back the fully constructed class instance.
-        $this->resolved[$abstract] = true;
+        $this->resolved[ $abstract ] = true;
 
-        array_pop($this->with);
+        array_pop( $this->with );
 
         return $object;
     }
@@ -648,17 +648,17 @@ 
      * @param  string  $abstract
      * @return mixed   $concrete
      */
-    protected function getConcrete($abstract)
+    protected function getConcrete( $abstract )
     {
-        if (! is_null($concrete = $this->getContextualConcrete($abstract))) {
+        if ( ! is_null( $concrete = $this->getContextualConcrete( $abstract ) ) ) {
             return $concrete;
         }
 
         // If we don't have a registered resolver or concrete for the type, we'll just
         // assume each type is a concrete name and will attempt to resolve it as is
         // since the container should be able to resolve concretes automatically.
-        if (isset($this->bindings[$abstract])) {
-            return $this->bindings[$abstract]['concrete'];
+        if ( isset( $this->bindings[ $abstract ] ) ) {
+            return $this->bindings[ $abstract ][ 'concrete' ];
         }
 
         return $abstract;
@@ -670,21 +670,21 @@ 
      * @param  string  $abstract
      * @return string|null
      */
-    protected function getContextualConcrete($abstract)
+    protected function getContextualConcrete( $abstract )
     {
-        if (! is_null($binding = $this->findInContextualBindings($abstract))) {
+        if ( ! is_null( $binding = $this->findInContextualBindings( $abstract ) ) ) {
             return $binding;
         }
 
         // Next we need to see if a contextual binding might be bound under an alias of the
         // given abstract type. So, we will need to check if any aliases exist with this
         // type and then spin through them and check for contextual bindings on these.
-        if (empty($this->abstractAliases[$abstract])) {
+        if ( empty( $this->abstractAliases[ $abstract ] ) ) {
             return;
         }
 
-        foreach ($this->abstractAliases[$abstract] as $alias) {
-            if (! is_null($binding = $this->findInContextualBindings($alias))) {
+        foreach ( $this->abstractAliases[ $abstract ] as $alias ) {
+            if ( ! is_null( $binding = $this->findInContextualBindings( $alias ) ) ) {
                 return $binding;
             }
         }
@@ -696,10 +696,10 @@ 
      * @param  string  $abstract
      * @return string|null
      */
-    protected function findInContextualBindings($abstract)
+    protected function findInContextualBindings( $abstract )
     {
-        if (isset($this->contextual[end($this->buildStack)][$abstract])) {
-            return $this->contextual[end($this->buildStack)][$abstract];
+        if ( isset( $this->contextual[ end( $this->buildStack ) ][ $abstract ] ) ) {
+            return $this->contextual[ end( $this->buildStack ) ][ $abstract ];
         }
     }
 
@@ -710,7 +710,7 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    protected function isBuildable($concrete, $abstract)
+    protected function isBuildable( $concrete, $abstract )
     {
         return $concrete === $abstract || $concrete instanceof Closure;
     }
@@ -723,33 +723,33 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function build($concrete)
+    public function build( $concrete )
     {
         // If the concrete type is actually a Closure, we will just execute it and
         // hand back the results of the functions, which allows functions to be
         // used as resolvers for more fine-tuned resolution of these objects.
-        if ($concrete instanceof Closure) {
-            return $concrete($this, $this->getLastParameterOverride());
+        if ( $concrete instanceof Closure ) {
+            return $concrete( $this, $this->getLastParameterOverride() );
         }
 
-        $reflector = new ReflectionClass($concrete);
+        $reflector = new ReflectionClass( $concrete );
 
         // If the type is not instantiable, the developer is attempting to resolve
         // an abstract type such as an Interface of Abstract Class and there is
         // no binding registered for the abstractions so we need to bail out.
-        if (! $reflector->isInstantiable()) {
-            return $this->notInstantiable($concrete);
+        if ( ! $reflector->isInstantiable() ) {
+            return $this->notInstantiable( $concrete );
         }
 
-        $this->buildStack[] = $concrete;
+        $this->buildStack[ ] = $concrete;
 
         $constructor = $reflector->getConstructor();
 
         // If there are no constructors, that means there are no dependencies then
         // we can just resolve the instances of the objects right away, without
         // resolving any other types or dependencies out of these containers.
-        if (is_null($constructor)) {
-            array_pop($this->buildStack);
+        if ( is_null( $constructor ) ) {
+            array_pop( $this->buildStack );
 
             return new $concrete;
         }
@@ -763,9 +763,9 @@ 
             $dependencies
         );
 
-        array_pop($this->buildStack);
+        array_pop( $this->buildStack );
 
-        return $reflector->newInstanceArgs($instances);
+        return $reflector->newInstanceArgs( $instances );
     }
 
     /**
@@ -774,16 +774,16 @@ 
      * @param  array  $dependencies
      * @return array
      */
-    protected function resolveDependencies(array $dependencies)
+    protected function resolveDependencies( array $dependencies )
     {
-        $results = [];
+        $results = [ ];
 
-        foreach ($dependencies as $dependency) {
+        foreach ( $dependencies as $dependency ) {
             // If this dependency has a override for this particular build we will use
             // that instead as the value. Otherwise, we will continue with this run
             // of resolutions and let reflection attempt to determine the result.
-            if ($this->hasParameterOverride($dependency)) {
-                $results[] = $this->getParameterOverride($dependency);
+            if ( $this->hasParameterOverride( $dependency ) ) {
+                $results[ ] = $this->getParameterOverride( $dependency );
 
                 continue;
             }
@@ -791,9 +791,9 @@ 
             // If the class is null, it means the dependency is a string or some other
             // primitive type which we can not resolve since it is not a class and
             // we will just bomb out with an error since we have no-where to go.
-            $results[] = is_null($class = $dependency->getClass())
-                            ? $this->resolvePrimitive($dependency)
-                            : $this->resolveClass($dependency);
+            $results[ ] = is_null( $class = $dependency->getClass() )
+                            ? $this->resolvePrimitive( $dependency )
+                            : $this->resolveClass( $dependency );
         }
 
         return $results;
@@ -805,7 +805,7 @@ 
      * @param  \ReflectionParameter  $dependency
      * @return bool
      */
-    protected function hasParameterOverride($dependency)
+    protected function hasParameterOverride( $dependency )
     {
         return array_key_exists(
             $dependency->name, $this->getLastParameterOverride()
@@ -818,9 +818,9 @@ 
      * @param  \ReflectionParameter  $dependency
      * @return mixed
      */
-    protected function getParameterOverride($dependency)
+    protected function getParameterOverride( $dependency )
     {
-        return $this->getLastParameterOverride()[$dependency->name];
+        return $this->getLastParameterOverride()[ $dependency->name ];
     }
 
     /**
@@ -830,7 +830,7 @@ 
      */
     protected function getLastParameterOverride()
     {
-        return count($this->with) ? end($this->with) : [];
+        return count( $this->with ) ? end( $this->with ) : [ ];
     }
 
     /**
@@ -841,17 +841,17 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function resolvePrimitive(ReflectionParameter $parameter)
+    protected function resolvePrimitive( ReflectionParameter $parameter )
     {
-        if (! is_null($concrete = $this->getContextualConcrete('$'.$parameter->name))) {
-            return $concrete instanceof Closure ? $concrete($this) : $concrete;
+        if ( ! is_null( $concrete = $this->getContextualConcrete( '$' . $parameter->name ) ) ) {
+            return $concrete instanceof Closure ? $concrete( $this ) : $concrete;
         }
 
-        if ($parameter->isDefaultValueAvailable()) {
+        if ( $parameter->isDefaultValueAvailable() ) {
             return $parameter->getDefaultValue();
         }
 
-        $this->unresolvablePrimitive($parameter);
+        $this->unresolvablePrimitive( $parameter );
     }
 
     /**
@@ -862,17 +862,17 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function resolveClass(ReflectionParameter $parameter)
+    protected function resolveClass( ReflectionParameter $parameter )
     {
         try {
-            return $this->make($parameter->getClass()->name);
+            return $this->make( $parameter->getClass()->name );
         }
 
         // If we can not resolve the class instance, we will check to see if the value
         // is optional, and if it is we will return the optional parameter value as
         // the value of the dependency, similarly to how we do this with scalars.
-        catch (BindingResolutionException $e) {
-            if ($parameter->isOptional()) {
+        catch ( BindingResolutionException $e ) {
+            if ( $parameter->isOptional() ) {
                 return $parameter->getDefaultValue();
             }
 
@@ -888,17 +888,17 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function notInstantiable($concrete)
+    protected function notInstantiable( $concrete )
     {
-        if (! empty($this->buildStack)) {
-            $previous = implode(', ', $this->buildStack);
+        if ( ! empty( $this->buildStack ) ) {
+            $previous = implode( ', ', $this->buildStack );
 
             $message = "Target [$concrete] is not instantiable while building [$previous].";
         } else {
             $message = "Target [$concrete] is not instantiable.";
         }
 
-        throw new BindingResolutionException($message);
+        throw new BindingResolutionException( $message );
     }
 
     /**
@@ -909,11 +909,11 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function unresolvablePrimitive(ReflectionParameter $parameter)
+    protected function unresolvablePrimitive( ReflectionParameter $parameter )
     {
         $message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
 
-        throw new BindingResolutionException($message);
+        throw new BindingResolutionException( $message );
     }
 
     /**
@@ -923,16 +923,16 @@ 
      * @param  \Closure|null  $callback
      * @return void
      */
-    public function resolving($abstract, Closure $callback = null)
+    public function resolving( $abstract, Closure $callback = null )
     {
-        if (is_string($abstract)) {
-            $abstract = $this->getAlias($abstract);
+        if ( is_string( $abstract ) ) {
+            $abstract = $this->getAlias( $abstract );
         }
 
-        if (is_null($callback) && $abstract instanceof Closure) {
-            $this->globalResolvingCallbacks[] = $abstract;
+        if ( is_null( $callback ) && $abstract instanceof Closure ) {
+            $this->globalResolvingCallbacks[ ] = $abstract;
         } else {
-            $this->resolvingCallbacks[$abstract][] = $callback;
+            $this->resolvingCallbacks[ $abstract ][ ] = $callback;
         }
     }
 
@@ -943,16 +943,16 @@ 
      * @param  \Closure|null $callback
      * @return void
      */
-    public function afterResolving($abstract, Closure $callback = null)
+    public function afterResolving( $abstract, Closure $callback = null )
     {
-        if (is_string($abstract)) {
-            $abstract = $this->getAlias($abstract);
+        if ( is_string( $abstract ) ) {
+            $abstract = $this->getAlias( $abstract );
         }
 
-        if ($abstract instanceof Closure && is_null($callback)) {
-            $this->globalAfterResolvingCallbacks[] = $abstract;
+        if ( $abstract instanceof Closure && is_null( $callback ) ) {
+            $this->globalAfterResolvingCallbacks[ ] = $abstract;
         } else {
-            $this->afterResolvingCallbacks[$abstract][] = $callback;
+            $this->afterResolvingCallbacks[ $abstract ][ ] = $callback;
         }
     }
 
@@ -963,15 +963,15 @@ 
      * @param  mixed   $object
      * @return void
      */
-    protected function fireResolvingCallbacks($abstract, $object)
+    protected function fireResolvingCallbacks( $abstract, $object )
     {
-        $this->fireCallbackArray($object, $this->globalResolvingCallbacks);
+        $this->fireCallbackArray( $object, $this->globalResolvingCallbacks );
 
         $this->fireCallbackArray(
-            $object, $this->getCallbacksForType($abstract, $object, $this->resolvingCallbacks)
+            $object, $this->getCallbacksForType( $abstract, $object, $this->resolvingCallbacks )
         );
 
-        $this->fireAfterResolvingCallbacks($abstract, $object);
+        $this->fireAfterResolvingCallbacks( $abstract, $object );
     }
 
     /**
@@ -981,12 +981,12 @@ 
      * @param  mixed   $object
      * @return void
      */
-    protected function fireAfterResolvingCallbacks($abstract, $object)
+    protected function fireAfterResolvingCallbacks( $abstract, $object )
     {
-        $this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
+        $this->fireCallbackArray( $object, $this->globalAfterResolvingCallbacks );
 
         $this->fireCallbackArray(
-            $object, $this->getCallbacksForType($abstract, $object, $this->afterResolvingCallbacks)
+            $object, $this->getCallbacksForType( $abstract, $object, $this->afterResolvingCallbacks )
         );
     }
 
@@ -999,13 +999,13 @@ 
      *
      * @return array
      */
-    protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
+    protected function getCallbacksForType( $abstract, $object, array $callbacksPerType )
     {
-        $results = [];
+        $results = [ ];
 
-        foreach ($callbacksPerType as $type => $callbacks) {
-            if ($type === $abstract || $object instanceof $type) {
-                $results = array_merge($results, $callbacks);
+        foreach ( $callbacksPerType as $type => $callbacks ) {
+            if ( $type === $abstract || $object instanceof $type ) {
+                $results = array_merge( $results, $callbacks );
             }
         }
 
@@ -1019,10 +1019,10 @@ 
      * @param  array  $callbacks
      * @return void
      */
-    protected function fireCallbackArray($object, array $callbacks)
+    protected function fireCallbackArray( $object, array $callbacks )
     {
-        foreach ($callbacks as $callback) {
-            $callback($object, $this);
+        foreach ( $callbacks as $callback ) {
+            $callback( $object, $this );
         }
     }
 
@@ -1044,17 +1044,17 @@ 
      *
      * @throws \LogicException
      */
-    public function getAlias($abstract)
+    public function getAlias( $abstract )
     {
-        if (! isset($this->aliases[$abstract])) {
+        if ( ! isset( $this->aliases[ $abstract ] ) ) {
             return $abstract;
         }
 
-        if ($this->aliases[$abstract] === $abstract) {
-            throw new LogicException("[{$abstract}] is aliased to itself.");
+        if ( $this->aliases[ $abstract ] === $abstract ) {
+            throw new LogicException( "[{$abstract}] is aliased to itself." );
         }
 
-        return $this->getAlias($this->aliases[$abstract]);
+        return $this->getAlias( $this->aliases[ $abstract ] );
     }
 
     /**
@@ -1063,15 +1063,15 @@ 
      * @param  string  $abstract
      * @return array
      */
-    protected function getExtenders($abstract)
+    protected function getExtenders( $abstract )
     {
-        $abstract = $this->getAlias($abstract);
+        $abstract = $this->getAlias( $abstract );
 
-        if (isset($this->extenders[$abstract])) {
-            return $this->extenders[$abstract];
+        if ( isset( $this->extenders[ $abstract ] ) ) {
+            return $this->extenders[ $abstract ];
         }
 
-        return [];
+        return [ ];
     }
 
     /**
@@ -1080,9 +1080,9 @@ 
      * @param  string  $abstract
      * @return void
      */
-    public function forgetExtenders($abstract)
+    public function forgetExtenders( $abstract )
     {
-        unset($this->extenders[$this->getAlias($abstract)]);
+        unset( $this->extenders[ $this->getAlias( $abstract ) ] );
     }
 
     /**
@@ -1091,9 +1091,9 @@ 
      * @param  string  $abstract
      * @return void
      */
-    protected function dropStaleInstances($abstract)
+    protected function dropStaleInstances( $abstract )
     {
-        unset($this->instances[$abstract], $this->aliases[$abstract]);
+        unset( $this->instances[ $abstract ], $this->aliases[ $abstract ] );
     }
 
     /**
@@ -1102,9 +1102,9 @@ 
      * @param  string  $abstract
      * @return void
      */
-    public function forgetInstance($abstract)
+    public function forgetInstance( $abstract )
     {
-        unset($this->instances[$abstract]);
+        unset( $this->instances[ $abstract ] );
     }
 
     /**
@@ -1114,7 +1114,7 @@ 
      */
     public function forgetInstances()
     {
-        $this->instances = [];
+        $this->instances = [ ];
     }
 
     /**
@@ -1124,11 +1124,11 @@ 
      */
     public function flush()
     {
-        $this->aliases = [];
-        $this->resolved = [];
-        $this->bindings = [];
-        $this->instances = [];
-        $this->abstractAliases = [];
+        $this->aliases = [ ];
+        $this->resolved = [ ];
+        $this->bindings = [ ];
+        $this->instances = [ ];
+        $this->abstractAliases = [ ];
     }
 
     /**
@@ -1138,7 +1138,7 @@ 
      */
     public static function getInstance()
     {
-        if (is_null(static::$instance)) {
+        if ( is_null( static::$instance ) ) {
             static::$instance = new static;
         }
 
@@ -1151,7 +1151,7 @@ 
      * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\Container|null  $container
      * @return static
      */
-    public static function setInstance(ContainerContract $container = null)
+    public static function setInstance( ContainerContract $container = null )
     {
         return static::$instance = $container;
     }
@@ -1162,9 +1162,9 @@ 
      * @param  string  $key
      * @return bool
      */
-    public function offsetExists($key)
+    public function offsetExists( $key )
     {
-        return $this->bound($key);
+        return $this->bound( $key );
     }
 
     /**
@@ -1173,9 +1173,9 @@ 
      * @param  string  $key
      * @return mixed
      */
-    public function offsetGet($key)
+    public function offsetGet( $key )
     {
-        return $this->make($key);
+        return $this->make( $key );
     }
 
     /**
@@ -1185,9 +1185,9 @@ 
      * @param  mixed   $value
      * @return void
      */
-    public function offsetSet($key, $value)
+    public function offsetSet( $key, $value )
     {
-        $this->bind($key, $value instanceof Closure ? $value : function () use ($value) {
+        $this->bind( $key, $value instanceof Closure ? $value : function() use ( $value ) {
             return $value;
         });
     }
@@ -1198,9 +1198,9 @@ 
      * @param  string  $key
      * @return void
      */
-    public function offsetUnset($key)
+    public function offsetUnset( $key )
     {
-        unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
+        unset( $this->bindings[ $key ], $this->instances[ $key ], $this->resolved[ $key ] );
     }
 
     /**
@@ -1209,9 +1209,9 @@ 
      * @param  string  $key
      * @return mixed
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        return $this[$key];
+        return $this[ $key ];
     }
 
     /**
@@ -1221,8 +1221,8 @@ 
      * @param  mixed   $value
      * @return void
      */
-    public function __set($key, $value)
+    public function __set( $key, $value )
     {
-        $this[$key] = $value;
+        $this[ $key ] = $value;
     }
 }

Braces +64 added lines, -128 removed lines

@@ -143,8 +143,7 @@ 
      * @param  string  $concrete
      * @return \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\ContextualBindingBuilder
      */
-    public function when($concrete)
-    {
+    public function when($concrete) {
         return new ContextualBindingBuilder($this, $this->getAlias($concrete));
     }
 
@@ -154,8 +153,7 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    public function bound($abstract)
-    {
+    public function bound($abstract) {
         return isset($this->bindings[$abstract]) ||
                isset($this->instances[$abstract]) ||
                $this->isAlias($abstract);
@@ -167,8 +165,7 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    public function resolved($abstract)
-    {
+    public function resolved($abstract) {
         if ($this->isAlias($abstract)) {
             $abstract = $this->getAlias($abstract);
         }
@@ -183,8 +180,7 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    public function isShared($abstract)
-    {
+    public function isShared($abstract) {
         return isset($this->instances[$abstract]) ||
               (isset($this->bindings[$abstract]['shared']) &&
                $this->bindings[$abstract]['shared'] === true);
@@ -196,8 +192,7 @@ 
      * @param  string  $name
      * @return bool
      */
-    public function isAlias($name)
-    {
+    public function isAlias($name) {
         return isset($this->aliases[$name]);
     }
 
@@ -209,8 +204,7 @@ 
      * @param  bool  $shared
      * @return void
      */
-    public function bind($abstract, $concrete = null, $shared = false)
-    {
+    public function bind($abstract, $concrete = null, $shared = false) {
         // If no concrete type was given, we will simply set the concrete type to the
         // abstract type. After that, the concrete type to be registered as shared
         // without being forced to state their classes in both of the parameters.
@@ -244,8 +238,7 @@ 
      * @param  string  $concrete
      * @return \Closure
      */
-    protected function getClosure($abstract, $concrete)
-    {
+    protected function getClosure($abstract, $concrete) {
         return function ($container, $parameters = []) use ($abstract, $concrete) {
             if ($abstract == $concrete) {
                 return $container->build($concrete);
@@ -261,8 +254,7 @@ 
      * @param  string  $method
      * @return bool
      */
-    public function hasMethodBinding($method)
-    {
+    public function hasMethodBinding($method) {
         return isset($this->methodBindings[$method]);
     }
 
@@ -273,8 +265,7 @@ 
      * @param  \Closure  $callback
      * @return void
      */
-    public function bindMethod($method, $callback)
-    {
+    public function bindMethod($method, $callback) {
         $this->methodBindings[$method] = $callback;
     }
 
@@ -285,8 +276,7 @@ 
      * @param  mixed  $instance
      * @return mixed
      */
-    public function callMethodBinding($method, $instance)
-    {
+    public function callMethodBinding($method, $instance) {
         return call_user_func($this->methodBindings[$method], $instance, $this);
     }
 
@@ -298,8 +288,7 @@ 
      * @param  \Closure|string  $implementation
      * @return void
      */
-    public function addContextualBinding($concrete, $abstract, $implementation)
-    {
+    public function addContextualBinding($concrete, $abstract, $implementation) {
         $this->contextual[$concrete][$this->getAlias($abstract)] = $implementation;
     }
 
@@ -311,8 +300,7 @@ 
      * @param  bool  $shared
      * @return void
      */
-    public function bindIf($abstract, $concrete = null, $shared = false)
-    {
+    public function bindIf($abstract, $concrete = null, $shared = false) {
         if (! $this->bound($abstract)) {
             $this->bind($abstract, $concrete, $shared);
         }
@@ -325,8 +313,7 @@ 
      * @param  \Closure|string|null  $concrete
      * @return void
      */
-    public function singleton($abstract, $concrete = null)
-    {
+    public function singleton($abstract, $concrete = null) {
         $this->bind($abstract, $concrete, true);
     }
 
@@ -339,8 +326,7 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function extend($abstract, Closure $closure)
-    {
+    public function extend($abstract, Closure $closure) {
         $abstract = $this->getAlias($abstract);
 
         if (isset($this->instances[$abstract])) {
@@ -363,8 +349,7 @@ 
      * @param  mixed   $instance
      * @return void
      */
-    public function instance($abstract, $instance)
-    {
+    public function instance($abstract, $instance) {
         $this->removeAbstractAlias($abstract);
 
         $isBound = $this->bound($abstract);
@@ -387,8 +372,7 @@ 
      * @param  string  $searched
      * @return void
      */
-    protected function removeAbstractAlias($searched)
-    {
+    protected function removeAbstractAlias($searched) {
         if (! isset($this->aliases[$searched])) {
             return;
         }
@@ -409,8 +393,7 @@ 
      * @param  array|mixed   ...$tags
      * @return void
      */
-    public function tag($abstracts, $tags)
-    {
+    public function tag($abstracts, $tags) {
         $tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
 
         foreach ($tags as $tag) {
@@ -430,8 +413,7 @@ 
      * @param  string  $tag
      * @return array
      */
-    public function tagged($tag)
-    {
+    public function tagged($tag) {
         $results = [];
 
         if (isset($this->tags[$tag])) {
@@ -450,8 +432,7 @@ 
      * @param  string  $alias
      * @return void
      */
-    public function alias($abstract, $alias)
-    {
+    public function alias($abstract, $alias) {
         $this->aliases[$alias] = $abstract;
 
         $this->abstractAliases[$abstract][] = $alias;
@@ -464,8 +445,7 @@ 
      * @param  \Closure  $callback
      * @return mixed
      */
-    public function rebinding($abstract, Closure $callback)
-    {
+    public function rebinding($abstract, Closure $callback) {
         $this->reboundCallbacks[$abstract = $this->getAlias($abstract)][] = $callback;
 
         if ($this->bound($abstract)) {
@@ -481,8 +461,7 @@ 
      * @param  string  $method
      * @return mixed
      */
-    public function refresh($abstract, $target, $method)
-    {
+    public function refresh($abstract, $target, $method) {
         return $this->rebinding($abstract, function ($app, $instance) use ($target, $method) {
             $target->{$method}($instance);
         });
@@ -494,8 +473,7 @@ 
      * @param  string  $abstract
      * @return void
      */
-    protected function rebound($abstract)
-    {
+    protected function rebound($abstract) {
         $instance = $this->make($abstract);
 
         foreach ($this->getReboundCallbacks($abstract) as $callback) {
@@ -509,8 +487,7 @@ 
      * @param  string  $abstract
      * @return array
      */
-    protected function getReboundCallbacks($abstract)
-    {
+    protected function getReboundCallbacks($abstract) {
         if (isset($this->reboundCallbacks[$abstract])) {
             return $this->reboundCallbacks[$abstract];
         }
@@ -525,8 +502,7 @@ 
      * @param  array  $parameters
      * @return \Closure
      */
-    public function wrap(Closure $callback, array $parameters = [])
-    {
+    public function wrap(Closure $callback, array $parameters = []) {
         return function () use ($callback, $parameters) {
             return $this->call($callback, $parameters);
         };
@@ -540,8 +516,7 @@ 
      * @param  string|null  $defaultMethod
      * @return mixed
      */
-    public function call($callback, array $parameters = [], $defaultMethod = null)
-    {
+    public function call($callback, array $parameters = [], $defaultMethod = null) {
         return BoundMethod::call($this, $callback, $parameters, $defaultMethod);
     }
 
@@ -551,8 +526,7 @@ 
      * @param  string  $abstract
      * @return \Closure
      */
-    public function factory($abstract)
-    {
+    public function factory($abstract) {
         return function () use ($abstract) {
             return $this->make($abstract);
         };
@@ -565,8 +539,7 @@ 
      * @param  array  $parameters
      * @return mixed
      */
-    public function makeWith($abstract, array $parameters)
-    {
+    public function makeWith($abstract, array $parameters) {
         return $this->resolve($abstract, $parameters);
     }
 
@@ -576,8 +549,7 @@ 
      * @param  string  $abstract
      * @return mixed
      */
-    public function make($abstract)
-    {
+    public function make($abstract) {
         return $this->resolve($abstract);
     }
 
@@ -588,8 +560,7 @@ 
      * @param  array  $parameters
      * @return mixed
      */
-    protected function resolve($abstract, $parameters = [])
-    {
+    protected function resolve($abstract, $parameters = []) {
         $abstract = $this->getAlias($abstract);
 
         $needsContextualBuild = ! empty($parameters) || ! is_null(
@@ -648,8 +619,7 @@ 
      * @param  string  $abstract
      * @return mixed   $concrete
      */
-    protected function getConcrete($abstract)
-    {
+    protected function getConcrete($abstract) {
         if (! is_null($concrete = $this->getContextualConcrete($abstract))) {
             return $concrete;
         }
@@ -670,8 +640,7 @@ 
      * @param  string  $abstract
      * @return string|null
      */
-    protected function getContextualConcrete($abstract)
-    {
+    protected function getContextualConcrete($abstract) {
         if (! is_null($binding = $this->findInContextualBindings($abstract))) {
             return $binding;
         }
@@ -696,8 +665,7 @@ 
      * @param  string  $abstract
      * @return string|null
      */
-    protected function findInContextualBindings($abstract)
-    {
+    protected function findInContextualBindings($abstract) {
         if (isset($this->contextual[end($this->buildStack)][$abstract])) {
             return $this->contextual[end($this->buildStack)][$abstract];
         }
@@ -710,8 +678,7 @@ 
      * @param  string  $abstract
      * @return bool
      */
-    protected function isBuildable($concrete, $abstract)
-    {
+    protected function isBuildable($concrete, $abstract) {
         return $concrete === $abstract || $concrete instanceof Closure;
     }
 
@@ -723,8 +690,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function build($concrete)
-    {
+    public function build($concrete) {
         // If the concrete type is actually a Closure, we will just execute it and
         // hand back the results of the functions, which allows functions to be
         // used as resolvers for more fine-tuned resolution of these objects.
@@ -774,8 +740,7 @@ 
      * @param  array  $dependencies
      * @return array
      */
-    protected function resolveDependencies(array $dependencies)
-    {
+    protected function resolveDependencies(array $dependencies) {
         $results = [];
 
         foreach ($dependencies as $dependency) {
@@ -805,8 +770,7 @@ 
      * @param  \ReflectionParameter  $dependency
      * @return bool
      */
-    protected function hasParameterOverride($dependency)
-    {
+    protected function hasParameterOverride($dependency) {
         return array_key_exists(
             $dependency->name, $this->getLastParameterOverride()
         );
@@ -818,8 +782,7 @@ 
      * @param  \ReflectionParameter  $dependency
      * @return mixed
      */
-    protected function getParameterOverride($dependency)
-    {
+    protected function getParameterOverride($dependency) {
         return $this->getLastParameterOverride()[$dependency->name];
     }
 
@@ -828,8 +791,7 @@ 
      *
      * @return array
      */
-    protected function getLastParameterOverride()
-    {
+    protected function getLastParameterOverride() {
         return count($this->with) ? end($this->with) : [];
     }
 
@@ -841,8 +803,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function resolvePrimitive(ReflectionParameter $parameter)
-    {
+    protected function resolvePrimitive(ReflectionParameter $parameter) {
         if (! is_null($concrete = $this->getContextualConcrete('$'.$parameter->name))) {
             return $concrete instanceof Closure ? $concrete($this) : $concrete;
         }
@@ -862,8 +823,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
+    protected function resolveClass(ReflectionParameter $parameter) {
         try {
             return $this->make($parameter->getClass()->name);
         }
@@ -888,8 +848,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function notInstantiable($concrete)
-    {
+    protected function notInstantiable($concrete) {
         if (! empty($this->buildStack)) {
             $previous = implode(', ', $this->buildStack);
 
@@ -909,8 +868,7 @@ 
      *
      * @throws \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\BindingResolutionException
      */
-    protected function unresolvablePrimitive(ReflectionParameter $parameter)
-    {
+    protected function unresolvablePrimitive(ReflectionParameter $parameter) {
         $message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
 
         throw new BindingResolutionException($message);
@@ -923,8 +881,7 @@ 
      * @param  \Closure|null  $callback
      * @return void
      */
-    public function resolving($abstract, Closure $callback = null)
-    {
+    public function resolving($abstract, Closure $callback = null) {
         if (is_string($abstract)) {
             $abstract = $this->getAlias($abstract);
         }
@@ -943,8 +900,7 @@ 
      * @param  \Closure|null $callback
      * @return void
      */
-    public function afterResolving($abstract, Closure $callback = null)
-    {
+    public function afterResolving($abstract, Closure $callback = null) {
         if (is_string($abstract)) {
             $abstract = $this->getAlias($abstract);
         }
@@ -963,8 +919,7 @@ 
      * @param  mixed   $object
      * @return void
      */
-    protected function fireResolvingCallbacks($abstract, $object)
-    {
+    protected function fireResolvingCallbacks($abstract, $object) {
         $this->fireCallbackArray($object, $this->globalResolvingCallbacks);
 
         $this->fireCallbackArray(
@@ -981,8 +936,7 @@ 
      * @param  mixed   $object
      * @return void
      */
-    protected function fireAfterResolvingCallbacks($abstract, $object)
-    {
+    protected function fireAfterResolvingCallbacks($abstract, $object) {
         $this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
 
         $this->fireCallbackArray(
@@ -999,8 +953,7 @@ 
      *
      * @return array
      */
-    protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
-    {
+    protected function getCallbacksForType($abstract, $object, array $callbacksPerType) {
         $results = [];
 
         foreach ($callbacksPerType as $type => $callbacks) {
@@ -1019,8 +972,7 @@ 
      * @param  array  $callbacks
      * @return void
      */
-    protected function fireCallbackArray($object, array $callbacks)
-    {
+    protected function fireCallbackArray($object, array $callbacks) {
         foreach ($callbacks as $callback) {
             $callback($object, $this);
         }
@@ -1031,8 +983,7 @@ 
      *
      * @return array
      */
-    public function getBindings()
-    {
+    public function getBindings() {
         return $this->bindings;
     }
 
@@ -1044,8 +995,7 @@ 
      *
      * @throws \LogicException
      */
-    public function getAlias($abstract)
-    {
+    public function getAlias($abstract) {
         if (! isset($this->aliases[$abstract])) {
             return $abstract;
         }
@@ -1063,8 +1013,7 @@ 
      * @param  string  $abstract
      * @return array
      */
-    protected function getExtenders($abstract)
-    {
+    protected function getExtenders($abstract) {
         $abstract = $this->getAlias($abstract);
 
         if (isset($this->extenders[$abstract])) {
@@ -1080,8 +1029,7 @@ 
      * @param  string  $abstract
      * @return void
      */
-    public function forgetExtenders($abstract)
-    {
+    public function forgetExtenders($abstract) {
         unset($this->extenders[$this->getAlias($abstract)]);
     }
 
@@ -1091,8 +1039,7 @@ 
      * @param  string  $abstract
      * @return void
      */
-    protected function dropStaleInstances($abstract)
-    {
+    protected function dropStaleInstances($abstract) {
         unset($this->instances[$abstract], $this->aliases[$abstract]);
     }
 
@@ -1102,8 +1049,7 @@ 
      * @param  string  $abstract
      * @return void
      */
-    public function forgetInstance($abstract)
-    {
+    public function forgetInstance($abstract) {
         unset($this->instances[$abstract]);
     }
 
@@ -1112,8 +1058,7 @@ 
      *
      * @return void
      */
-    public function forgetInstances()
-    {
+    public function forgetInstances() {
         $this->instances = [];
     }
 
@@ -1122,8 +1067,7 @@ 
      *
      * @return void
      */
-    public function flush()
-    {
+    public function flush() {
         $this->aliases = [];
         $this->resolved = [];
         $this->bindings = [];
@@ -1136,8 +1080,7 @@ 
      *
      * @return static
      */
-    public static function getInstance()
-    {
+    public static function getInstance() {
         if (is_null(static::$instance)) {
             static::$instance = new static;
         }
@@ -1151,8 +1094,7 @@ 
      * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\Container|null  $container
      * @return static
      */
-    public static function setInstance(ContainerContract $container = null)
-    {
+    public static function setInstance(ContainerContract $container = null) {
         return static::$instance = $container;
     }
 
@@ -1162,8 +1104,7 @@ 
      * @param  string  $key
      * @return bool
      */
-    public function offsetExists($key)
-    {
+    public function offsetExists($key) {
         return $this->bound($key);
     }
 
@@ -1173,8 +1114,7 @@ 
      * @param  string  $key
      * @return mixed
      */
-    public function offsetGet($key)
-    {
+    public function offsetGet($key) {
         return $this->make($key);
     }
 
@@ -1185,8 +1125,7 @@ 
      * @param  mixed   $value
      * @return void
      */
-    public function offsetSet($key, $value)
-    {
+    public function offsetSet($key, $value) {
         $this->bind($key, $value instanceof Closure ? $value : function () use ($value) {
             return $value;
         });
@@ -1198,8 +1137,7 @@ 
      * @param  string  $key
      * @return void
      */
-    public function offsetUnset($key)
-    {
+    public function offsetUnset($key) {
         unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
     }
 
@@ -1209,8 +1147,7 @@ 
      * @param  string  $key
      * @return mixed
      */
-    public function __get($key)
-    {
+    public function __get($key) {
         return $this[$key];
     }
 
@@ -1221,8 +1158,7 @@ 
      * @param  mixed   $value
      * @return void
      */
-    public function __set($key, $value)
-    {
+    public function __set($key, $value) {
         $this[$key] = $value;
     }
 }

vendor_prefixed/illuminate/container/ContextualBindingBuilder.php

Indentation +53 added lines, -53 removed lines

@@ -12,63 +12,63 @@
 
 class ContextualBindingBuilder implements ContextualBindingBuilderContract
 {
-    /**
-     * The underlying container instance.
-     *
-     * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container
-     */
-    protected $container;
+	/**
+	 * The underlying container instance.
+	 *
+	 * @var \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container
+	 */
+	protected $container;
 
-    /**
-     * The concrete instance.
-     *
-     * @var string
-     */
-    protected $concrete;
+	/**
+	 * The concrete instance.
+	 *
+	 * @var string
+	 */
+	protected $concrete;
 
-    /**
-     * The abstract target.
-     *
-     * @var string
-     */
-    protected $needs;
+	/**
+	 * The abstract target.
+	 *
+	 * @var string
+	 */
+	protected $needs;
 
-    /**
-     * Create a new contextual binding builder.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
-     * @param  string  $concrete
-     * @return void
-     */
-    public function __construct(Container $container, $concrete)
-    {
-        $this->concrete = $concrete;
-        $this->container = $container;
-    }
+	/**
+	 * Create a new contextual binding builder.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
+	 * @param  string  $concrete
+	 * @return void
+	 */
+	public function __construct(Container $container, $concrete)
+	{
+		$this->concrete = $concrete;
+		$this->container = $container;
+	}
 
-    /**
-     * Define the abstract target that depends on the context.
-     *
-     * @param  string  $abstract
-     * @return $this
-     */
-    public function needs($abstract)
-    {
-        $this->needs = $abstract;
+	/**
+	 * Define the abstract target that depends on the context.
+	 *
+	 * @param  string  $abstract
+	 * @return $this
+	 */
+	public function needs($abstract)
+	{
+		$this->needs = $abstract;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Define the implementation for the contextual binding.
-     *
-     * @param  \Closure|string  $implementation
-     * @return void
-     */
-    public function give($implementation)
-    {
-        $this->container->addContextualBinding(
-            $this->concrete, $this->needs, $implementation
-        );
-    }
+	/**
+	 * Define the implementation for the contextual binding.
+	 *
+	 * @param  \Closure|string  $implementation
+	 * @return void
+	 */
+	public function give($implementation)
+	{
+		$this->container->addContextualBinding(
+			$this->concrete, $this->needs, $implementation
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
      * @param  string  $concrete
      * @return void
      */
-    public function __construct(Container $container, $concrete)
+    public function __construct( Container $container, $concrete )
     {
         $this->concrete = $concrete;
         $this->container = $container;
@@ -52,7 +52,7 @@ 
      * @param  string  $abstract
      * @return $this
      */
-    public function needs($abstract)
+    public function needs( $abstract )
     {
         $this->needs = $abstract;
 
@@ -65,7 +65,7 @@ 
      * @param  \Closure|string  $implementation
      * @return void
      */
-    public function give($implementation)
+    public function give( $implementation )
     {
         $this->container->addContextualBinding(
             $this->concrete, $this->needs, $implementation

Braces +4 added lines, -8 removed lines

@@ -10,8 +10,7 @@ 
 
 use GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Container\ContextualBindingBuilder as ContextualBindingBuilderContract;
 
-class ContextualBindingBuilder implements ContextualBindingBuilderContract
-{
+class ContextualBindingBuilder implements ContextualBindingBuilderContract {
     /**
      * The underlying container instance.
      *
@@ -40,8 +39,7 @@ 
      * @param  string  $concrete
      * @return void
      */
-    public function __construct(Container $container, $concrete)
-    {
+    public function __construct(Container $container, $concrete) {
         $this->concrete = $concrete;
         $this->container = $container;
     }
@@ -52,8 +50,7 @@ 
      * @param  string  $abstract
      * @return $this
      */
-    public function needs($abstract)
-    {
+    public function needs($abstract) {
         $this->needs = $abstract;
 
         return $this;
@@ -65,8 +62,7 @@ 
      * @param  \Closure|string  $implementation
      * @return void
      */
-    public function give($implementation)
-    {
+    public function give($implementation) {
         $this->container->addContextualBinding(
             $this->concrete, $this->needs, $implementation
         );

vendor_prefixed/illuminate/container/BoundMethod.php

Indentation +160 added lines, -160 removed lines

@@ -15,164 +15,164 @@
 
 class BoundMethod
 {
-    /**
-     * Call the given Closure / class@method and inject its dependencies.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
-     * @param  callable|string  $callback
-     * @param  array  $parameters
-     * @param  string|null  $defaultMethod
-     * @return mixed
-     */
-    public static function call($container, $callback, array $parameters = [], $defaultMethod = null)
-    {
-        if (static::isCallableWithAtSign($callback) || $defaultMethod) {
-            return static::callClass($container, $callback, $parameters, $defaultMethod);
-        }
-
-        return static::callBoundMethod($container, $callback, function () use ($container, $callback, $parameters) {
-            return call_user_func_array(
-                $callback, static::getMethodDependencies($container, $callback, $parameters)
-            );
-        });
-    }
-
-    /**
-     * Call a string reference to a class using Class@method syntax.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
-     * @param  string  $target
-     * @param  array  $parameters
-     * @param  string|null  $defaultMethod
-     * @return mixed
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected static function callClass($container, $target, array $parameters = [], $defaultMethod = null)
-    {
-        $segments = explode('@', $target);
-
-        // We will assume an @ sign is used to delimit the class name from the method
-        // name. We will split on this @ sign and then build a callable array that
-        // we can pass right back into the "call" method for dependency binding.
-        $method = count($segments) == 2
-                        ? $segments[1] : $defaultMethod;
-
-        if (is_null($method)) {
-            throw new InvalidArgumentException('Method not provided.');
-        }
-
-        return static::call(
-            $container, [$container->make($segments[0]), $method], $parameters
-        );
-    }
-
-    /**
-     * Call a method that has been bound to the container.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
-     * @param  callable  $callback
-     * @param  mixed  $default
-     * @return mixed
-     */
-    protected static function callBoundMethod($container, $callback, $default)
-    {
-        if (! is_array($callback)) {
-            return $default instanceof Closure ? $default() : $default;
-        }
-
-        // Here we need to turn the array callable into a Class@method string we can use to
-        // examine the container and see if there are any method bindings for this given
-        // method. If there are, we can call this method binding callback immediately.
-        $method = static::normalizeMethod($callback);
-
-        if ($container->hasMethodBinding($method)) {
-            return $container->callMethodBinding($method, $callback[0]);
-        }
-
-        return $default instanceof Closure ? $default() : $default;
-    }
-
-    /**
-     * Normalize the given callback into a Class@method string.
-     *
-     * @param  callable  $callback
-     * @return string
-     */
-    protected static function normalizeMethod($callback)
-    {
-        $class = is_string($callback[0]) ? $callback[0] : get_class($callback[0]);
-
-        return "{$class}@{$callback[1]}";
-    }
-
-    /**
-     * Get all dependencies for a given method.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container
-     * @param  callable|string  $callback
-     * @param  array  $parameters
-     * @return array
-     */
-    protected static function getMethodDependencies($container, $callback, array $parameters = [])
-    {
-        $dependencies = [];
-
-        foreach (static::getCallReflector($callback)->getParameters() as $parameter) {
-            static::addDependencyForCallParameter($container, $parameter, $parameters, $dependencies);
-        }
-
-        return array_merge($dependencies, $parameters);
-    }
-
-    /**
-     * Get the proper reflection instance for the given callback.
-     *
-     * @param  callable|string  $callback
-     * @return \ReflectionFunctionAbstract
-     */
-    protected static function getCallReflector($callback)
-    {
-        if (is_string($callback) && strpos($callback, '::') !== false) {
-            $callback = explode('::', $callback);
-        }
-
-        return is_array($callback)
-                        ? new ReflectionMethod($callback[0], $callback[1])
-                        : new ReflectionFunction($callback);
-    }
-
-    /**
-     * Get the dependency for the given call parameter.
-     *
-     * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
-     * @param  \ReflectionParameter  $parameter
-     * @param  array  $parameters
-     * @param  array  $dependencies
-     * @return mixed
-     */
-    protected static function addDependencyForCallParameter($container, $parameter,
-                                                            array &$parameters, &$dependencies)
-    {
-        if (array_key_exists($parameter->name, $parameters)) {
-            $dependencies[] = $parameters[$parameter->name];
-
-            unset($parameters[$parameter->name]);
-        } elseif ($parameter->getClass()) {
-            $dependencies[] = $container->make($parameter->getClass()->name);
-        } elseif ($parameter->isDefaultValueAvailable()) {
-            $dependencies[] = $parameter->getDefaultValue();
-        }
-    }
-
-    /**
-     * Determine if the given string is in Class@method syntax.
-     *
-     * @param  mixed  $callback
-     * @return bool
-     */
-    protected static function isCallableWithAtSign($callback)
-    {
-        return is_string($callback) && strpos($callback, '@') !== false;
-    }
+	/**
+	 * Call the given Closure / class@method and inject its dependencies.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
+	 * @param  callable|string  $callback
+	 * @param  array  $parameters
+	 * @param  string|null  $defaultMethod
+	 * @return mixed
+	 */
+	public static function call($container, $callback, array $parameters = [], $defaultMethod = null)
+	{
+		if (static::isCallableWithAtSign($callback) || $defaultMethod) {
+			return static::callClass($container, $callback, $parameters, $defaultMethod);
+		}
+
+		return static::callBoundMethod($container, $callback, function () use ($container, $callback, $parameters) {
+			return call_user_func_array(
+				$callback, static::getMethodDependencies($container, $callback, $parameters)
+			);
+		});
+	}
+
+	/**
+	 * Call a string reference to a class using Class@method syntax.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
+	 * @param  string  $target
+	 * @param  array  $parameters
+	 * @param  string|null  $defaultMethod
+	 * @return mixed
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	protected static function callClass($container, $target, array $parameters = [], $defaultMethod = null)
+	{
+		$segments = explode('@', $target);
+
+		// We will assume an @ sign is used to delimit the class name from the method
+		// name. We will split on this @ sign and then build a callable array that
+		// we can pass right back into the "call" method for dependency binding.
+		$method = count($segments) == 2
+						? $segments[1] : $defaultMethod;
+
+		if (is_null($method)) {
+			throw new InvalidArgumentException('Method not provided.');
+		}
+
+		return static::call(
+			$container, [$container->make($segments[0]), $method], $parameters
+		);
+	}
+
+	/**
+	 * Call a method that has been bound to the container.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
+	 * @param  callable  $callback
+	 * @param  mixed  $default
+	 * @return mixed
+	 */
+	protected static function callBoundMethod($container, $callback, $default)
+	{
+		if (! is_array($callback)) {
+			return $default instanceof Closure ? $default() : $default;
+		}
+
+		// Here we need to turn the array callable into a Class@method string we can use to
+		// examine the container and see if there are any method bindings for this given
+		// method. If there are, we can call this method binding callback immediately.
+		$method = static::normalizeMethod($callback);
+
+		if ($container->hasMethodBinding($method)) {
+			return $container->callMethodBinding($method, $callback[0]);
+		}
+
+		return $default instanceof Closure ? $default() : $default;
+	}
+
+	/**
+	 * Normalize the given callback into a Class@method string.
+	 *
+	 * @param  callable  $callback
+	 * @return string
+	 */
+	protected static function normalizeMethod($callback)
+	{
+		$class = is_string($callback[0]) ? $callback[0] : get_class($callback[0]);
+
+		return "{$class}@{$callback[1]}";
+	}
+
+	/**
+	 * Get all dependencies for a given method.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container
+	 * @param  callable|string  $callback
+	 * @param  array  $parameters
+	 * @return array
+	 */
+	protected static function getMethodDependencies($container, $callback, array $parameters = [])
+	{
+		$dependencies = [];
+
+		foreach (static::getCallReflector($callback)->getParameters() as $parameter) {
+			static::addDependencyForCallParameter($container, $parameter, $parameters, $dependencies);
+		}
+
+		return array_merge($dependencies, $parameters);
+	}
+
+	/**
+	 * Get the proper reflection instance for the given callback.
+	 *
+	 * @param  callable|string  $callback
+	 * @return \ReflectionFunctionAbstract
+	 */
+	protected static function getCallReflector($callback)
+	{
+		if (is_string($callback) && strpos($callback, '::') !== false) {
+			$callback = explode('::', $callback);
+		}
+
+		return is_array($callback)
+						? new ReflectionMethod($callback[0], $callback[1])
+						: new ReflectionFunction($callback);
+	}
+
+	/**
+	 * Get the dependency for the given call parameter.
+	 *
+	 * @param  \GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Container\Container  $container
+	 * @param  \ReflectionParameter  $parameter
+	 * @param  array  $parameters
+	 * @param  array  $dependencies
+	 * @return mixed
+	 */
+	protected static function addDependencyForCallParameter($container, $parameter,
+															array &$parameters, &$dependencies)
+	{
+		if (array_key_exists($parameter->name, $parameters)) {
+			$dependencies[] = $parameters[$parameter->name];
+
+			unset($parameters[$parameter->name]);
+		} elseif ($parameter->getClass()) {
+			$dependencies[] = $container->make($parameter->getClass()->name);
+		} elseif ($parameter->isDefaultValueAvailable()) {
+			$dependencies[] = $parameter->getDefaultValue();
+		}
+	}
+
+	/**
+	 * Determine if the given string is in Class@method syntax.
+	 *
+	 * @param  mixed  $callback
+	 * @return bool
+	 */
+	protected static function isCallableWithAtSign($callback)
+	{
+		return is_string($callback) && strpos($callback, '@') !== false;
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -24,15 +24,15 @@ 
      * @param  string|null  $defaultMethod
      * @return mixed
      */
-    public static function call($container, $callback, array $parameters = [], $defaultMethod = null)
+    public static function call( $container, $callback, array $parameters = [ ], $defaultMethod = null )
     {
-        if (static::isCallableWithAtSign($callback) || $defaultMethod) {
-            return static::callClass($container, $callback, $parameters, $defaultMethod);
+        if ( static::isCallableWithAtSign( $callback ) || $defaultMethod ) {
+            return static::callClass( $container, $callback, $parameters, $defaultMethod );
         }
 
-        return static::callBoundMethod($container, $callback, function () use ($container, $callback, $parameters) {
+        return static::callBoundMethod( $container, $callback, function() use ( $container, $callback, $parameters ) {
             return call_user_func_array(
-                $callback, static::getMethodDependencies($container, $callback, $parameters)
+                $callback, static::getMethodDependencies( $container, $callback, $parameters )
             );
         });
     }
@@ -48,22 +48,22 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    protected static function callClass($container, $target, array $parameters = [], $defaultMethod = null)
+    protected static function callClass( $container, $target, array $parameters = [ ], $defaultMethod = null )
     {
-        $segments = explode('@', $target);
+        $segments = explode( '@', $target );
 
         // We will assume an @ sign is used to delimit the class name from the method
         // name. We will split on this @ sign and then build a callable array that
         // we can pass right back into the "call" method for dependency binding.
-        $method = count($segments) == 2
-                        ? $segments[1] : $defaultMethod;
+        $method = count( $segments ) == 2
+                        ? $segments[ 1 ] : $defaultMethod;
 
-        if (is_null($method)) {
-            throw new InvalidArgumentException('Method not provided.');
+        if ( is_null( $method ) ) {
+            throw new InvalidArgumentException( 'Method not provided.' );
         }
 
         return static::call(
-            $container, [$container->make($segments[0]), $method], $parameters
+            $container, [ $container->make( $segments[ 0 ] ), $method ], $parameters
         );
     }
 
@@ -75,19 +75,19 @@ 
      * @param  mixed  $default
      * @return mixed
      */
-    protected static function callBoundMethod($container, $callback, $default)
+    protected static function callBoundMethod( $container, $callback, $default )
     {
-        if (! is_array($callback)) {
+        if ( ! is_array( $callback ) ) {
             return $default instanceof Closure ? $default() : $default;
         }
 
         // Here we need to turn the array callable into a Class@method string we can use to
         // examine the container and see if there are any method bindings for this given
         // method. If there are, we can call this method binding callback immediately.
-        $method = static::normalizeMethod($callback);
+        $method = static::normalizeMethod( $callback );
 
-        if ($container->hasMethodBinding($method)) {
-            return $container->callMethodBinding($method, $callback[0]);
+        if ( $container->hasMethodBinding( $method ) ) {
+            return $container->callMethodBinding( $method, $callback[ 0 ] );
         }
 
         return $default instanceof Closure ? $default() : $default;
@@ -99,11 +99,11 @@ 
      * @param  callable  $callback
      * @return string
      */
-    protected static function normalizeMethod($callback)
+    protected static function normalizeMethod( $callback )
     {
-        $class = is_string($callback[0]) ? $callback[0] : get_class($callback[0]);
+        $class = is_string( $callback[ 0 ] ) ? $callback[ 0 ] : get_class( $callback[ 0 ] );
 
-        return "{$class}@{$callback[1]}";
+        return "{$class}@{$callback[ 1 ]}";
     }
 
     /**
@@ -114,15 +114,15 @@ 
      * @param  array  $parameters
      * @return array
      */
-    protected static function getMethodDependencies($container, $callback, array $parameters = [])
+    protected static function getMethodDependencies( $container, $callback, array $parameters = [ ] )
     {
-        $dependencies = [];
+        $dependencies = [ ];
 
-        foreach (static::getCallReflector($callback)->getParameters() as $parameter) {
-            static::addDependencyForCallParameter($container, $parameter, $parameters, $dependencies);
+        foreach ( static::getCallReflector( $callback )->getParameters() as $parameter ) {
+            static::addDependencyForCallParameter( $container, $parameter, $parameters, $dependencies );
         }
 
-        return array_merge($dependencies, $parameters);
+        return array_merge( $dependencies, $parameters );
     }
 
     /**
@@ -131,15 +131,15 @@ 
      * @param  callable|string  $callback
      * @return \ReflectionFunctionAbstract
      */
-    protected static function getCallReflector($callback)
+    protected static function getCallReflector( $callback )
     {
-        if (is_string($callback) && strpos($callback, '::') !== false) {
-            $callback = explode('::', $callback);
+        if ( is_string( $callback ) && strpos( $callback, '::' ) !== false ) {
+            $callback = explode( '::', $callback );
         }
 
-        return is_array($callback)
-                        ? new ReflectionMethod($callback[0], $callback[1])
-                        : new ReflectionFunction($callback);
+        return is_array( $callback )
+                        ? new ReflectionMethod( $callback[ 0 ], $callback[ 1 ] )
+                        : new ReflectionFunction( $callback );
     }
 
     /**
@@ -151,17 +151,17 @@ 
      * @param  array  $dependencies
      * @return mixed
      */
-    protected static function addDependencyForCallParameter($container, $parameter,
-                                                            array &$parameters, &$dependencies)
+    protected static function addDependencyForCallParameter( $container, $parameter,
+                                                            array &$parameters, &$dependencies )
     {
-        if (array_key_exists($parameter->name, $parameters)) {
-            $dependencies[] = $parameters[$parameter->name];
-
-            unset($parameters[$parameter->name]);
-        } elseif ($parameter->getClass()) {
-            $dependencies[] = $container->make($parameter->getClass()->name);
-        } elseif ($parameter->isDefaultValueAvailable()) {
-            $dependencies[] = $parameter->getDefaultValue();
+        if ( array_key_exists( $parameter->name, $parameters ) ) {
+            $dependencies[ ] = $parameters[ $parameter->name ];
+
+            unset( $parameters[ $parameter->name ] );
+        } elseif ( $parameter->getClass() ) {
+            $dependencies[ ] = $container->make( $parameter->getClass()->name );
+        } elseif ( $parameter->isDefaultValueAvailable() ) {
+            $dependencies[ ] = $parameter->getDefaultValue();
         }
     }
 
@@ -171,8 +171,8 @@ 
      * @param  mixed  $callback
      * @return bool
      */
-    protected static function isCallableWithAtSign($callback)
+    protected static function isCallableWithAtSign( $callback )
     {
-        return is_string($callback) && strpos($callback, '@') !== false;
+        return is_string( $callback ) && strpos( $callback, '@' ) !== false;
     }
 }

Braces +9 added lines, -18 removed lines

@@ -13,8 +13,7 @@ 
 use ReflectionFunction;
 use InvalidArgumentException;
 
-class BoundMethod
-{
+class BoundMethod {
     /**
      * Call the given Closure / class@method and inject its dependencies.
      *
@@ -24,8 +23,7 @@ 
      * @param  string|null  $defaultMethod
      * @return mixed
      */
-    public static function call($container, $callback, array $parameters = [], $defaultMethod = null)
-    {
+    public static function call($container, $callback, array $parameters = [], $defaultMethod = null) {
         if (static::isCallableWithAtSign($callback) || $defaultMethod) {
             return static::callClass($container, $callback, $parameters, $defaultMethod);
         }
@@ -48,8 +46,7 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    protected static function callClass($container, $target, array $parameters = [], $defaultMethod = null)
-    {
+    protected static function callClass($container, $target, array $parameters = [], $defaultMethod = null) {
         $segments = explode('@', $target);
 
         // We will assume an @ sign is used to delimit the class name from the method
@@ -75,8 +72,7 @@ 
      * @param  mixed  $default
      * @return mixed
      */
-    protected static function callBoundMethod($container, $callback, $default)
-    {
+    protected static function callBoundMethod($container, $callback, $default) {
         if (! is_array($callback)) {
             return $default instanceof Closure ? $default() : $default;
         }
@@ -99,8 +95,7 @@ 
      * @param  callable  $callback
      * @return string
      */
-    protected static function normalizeMethod($callback)
-    {
+    protected static function normalizeMethod($callback) {
         $class = is_string($callback[0]) ? $callback[0] : get_class($callback[0]);
 
         return "{$class}@{$callback[1]}";
@@ -114,8 +109,7 @@ 
      * @param  array  $parameters
      * @return array
      */
-    protected static function getMethodDependencies($container, $callback, array $parameters = [])
-    {
+    protected static function getMethodDependencies($container, $callback, array $parameters = []) {
         $dependencies = [];
 
         foreach (static::getCallReflector($callback)->getParameters() as $parameter) {
@@ -131,8 +125,7 @@ 
      * @param  callable|string  $callback
      * @return \ReflectionFunctionAbstract
      */
-    protected static function getCallReflector($callback)
-    {
+    protected static function getCallReflector($callback) {
         if (is_string($callback) && strpos($callback, '::') !== false) {
             $callback = explode('::', $callback);
         }
@@ -152,8 +145,7 @@ 
      * @return mixed
      */
     protected static function addDependencyForCallParameter($container, $parameter,
-                                                            array &$parameters, &$dependencies)
-    {
+                                                            array &$parameters, &$dependencies) {
         if (array_key_exists($parameter->name, $parameters)) {
             $dependencies[] = $parameters[$parameter->name];
 
@@ -171,8 +163,7 @@ 
      * @param  mixed  $callback
      * @return bool
      */
-    protected static function isCallableWithAtSign($callback)
-    {
+    protected static function isCallableWithAtSign($callback) {
         return is_string($callback) && strpos($callback, '@') !== false;
     }
 }

vendor_prefixed/illuminate/contracts/Logging/Log.php

Indentation +82 added lines, -82 removed lines

@@ -4,95 +4,95 @@
 
 interface Log
 {
-    /**
-     * Log an alert message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function alert($message, array $context = []);
+	/**
+	 * Log an alert message to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function alert($message, array $context = []);
 
-    /**
-     * Log a critical message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function critical($message, array $context = []);
+	/**
+	 * Log a critical message to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function critical($message, array $context = []);
 
-    /**
-     * Log an error message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function error($message, array $context = []);
+	/**
+	 * Log an error message to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function error($message, array $context = []);
 
-    /**
-     * Log a warning message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function warning($message, array $context = []);
+	/**
+	 * Log a warning message to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function warning($message, array $context = []);
 
-    /**
-     * Log a notice to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function notice($message, array $context = []);
+	/**
+	 * Log a notice to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function notice($message, array $context = []);
 
-    /**
-     * Log an informational message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function info($message, array $context = []);
+	/**
+	 * Log an informational message to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function info($message, array $context = []);
 
-    /**
-     * Log a debug message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function debug($message, array $context = []);
+	/**
+	 * Log a debug message to the logs.
+	 *
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function debug($message, array $context = []);
 
-    /**
-     * Log a message to the logs.
-     *
-     * @param  string  $level
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function log($level, $message, array $context = []);
+	/**
+	 * Log a message to the logs.
+	 *
+	 * @param  string  $level
+	 * @param  string  $message
+	 * @param  array  $context
+	 * @return void
+	 */
+	public function log($level, $message, array $context = []);
 
-    /**
-     * Register a file log handler.
-     *
-     * @param  string  $path
-     * @param  string  $level
-     * @return void
-     */
-    public function useFiles($path, $level = 'debug');
+	/**
+	 * Register a file log handler.
+	 *
+	 * @param  string  $path
+	 * @param  string  $level
+	 * @return void
+	 */
+	public function useFiles($path, $level = 'debug');
 
-    /**
-     * Register a daily file log handler.
-     *
-     * @param  string  $path
-     * @param  int     $days
-     * @param  string  $level
-     * @return void
-     */
-    public function useDailyFiles($path, $days = 0, $level = 'debug');
+	/**
+	 * Register a daily file log handler.
+	 *
+	 * @param  string  $path
+	 * @param  int     $days
+	 * @param  string  $level
+	 * @return void
+	 */
+	public function useDailyFiles($path, $days = 0, $level = 'debug');
 }

Spacing +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function alert($message, array $context = []);
+    public function alert( $message, array $context = [ ] );
 
     /**
      * Log a critical message to the logs.
@@ -20,7 +20,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function critical($message, array $context = []);
+    public function critical( $message, array $context = [ ] );
 
     /**
      * Log an error message to the logs.
@@ -29,7 +29,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function error($message, array $context = []);
+    public function error( $message, array $context = [ ] );
 
     /**
      * Log a warning message to the logs.
@@ -38,7 +38,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function warning($message, array $context = []);
+    public function warning( $message, array $context = [ ] );
 
     /**
      * Log a notice to the logs.
@@ -47,7 +47,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function notice($message, array $context = []);
+    public function notice( $message, array $context = [ ] );
 
     /**
      * Log an informational message to the logs.
@@ -56,7 +56,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function info($message, array $context = []);
+    public function info( $message, array $context = [ ] );
 
     /**
      * Log a debug message to the logs.
@@ -65,7 +65,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function debug($message, array $context = []);
+    public function debug( $message, array $context = [ ] );
 
     /**
      * Log a message to the logs.
@@ -75,7 +75,7 @@ 
      * @param  array  $context
      * @return void
      */
-    public function log($level, $message, array $context = []);
+    public function log( $level, $message, array $context = [ ] );
 
     /**
      * Register a file log handler.
@@ -84,7 +84,7 @@ 
      * @param  string  $level
      * @return void
      */
-    public function useFiles($path, $level = 'debug');
+    public function useFiles( $path, $level = 'debug' );
 
     /**
      * Register a daily file log handler.
@@ -94,5 +94,5 @@ 
      * @param  string  $level
      * @return void
      */
-    public function useDailyFiles($path, $days = 0, $level = 'debug');
+    public function useDailyFiles( $path, $days = 0, $level = 'debug' );
 }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 
 namespace GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Logging;
 
-interface Log
-{
+interface Log {
     /**
      * Log an alert message to the logs.
      *

vendor_prefixed/illuminate/contracts/Session/Session.php

Indentation +158 added lines, -158 removed lines

@@ -10,162 +10,162 @@
 
 interface Session
 {
-    /**
-     * Get the name of the session.
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Get the current session ID.
-     *
-     * @return string
-     */
-    public function getId();
-
-    /**
-     * Set the session ID.
-     *
-     * @param  string  $id
-     * @return void
-     */
-    public function setId($id);
-
-    /**
-     * Start the session, reading the data from a handler.
-     *
-     * @return bool
-     */
-    public function start();
-
-    /**
-     * Save the session data to storage.
-     *
-     * @return bool
-     */
-    public function save();
-
-    /**
-     * Get all of the session data.
-     *
-     * @return array
-     */
-    public function all();
-
-    /**
-     * Checks if a key exists.
-     *
-     * @param  string|array  $key
-     * @return bool
-     */
-    public function exists($key);
-
-    /**
-     * Checks if an a key is present and not null.
-     *
-     * @param  string|array  $key
-     * @return bool
-     */
-    public function has($key);
-
-    /**
-     * Get an item from the session.
-     *
-     * @param  string  $key
-     * @param  mixed  $default
-     * @return mixed
-     */
-    public function get($key, $default = null);
-
-    /**
-     * Put a key / value pair or array of key / value pairs in the session.
-     *
-     * @param  string|array  $key
-     * @param  mixed       $value
-     * @return void
-     */
-    public function put($key, $value = null);
-
-    /**
-     * Get the CSRF token value.
-     *
-     * @return string
-     */
-    public function token();
-
-    /**
-     * Remove an item from the session, returning its value.
-     *
-     * @param  string  $key
-     * @return mixed
-     */
-    public function remove($key);
-
-    /**
-     * Remove one or many items from the session.
-     *
-     * @param  string|array  $keys
-     * @return void
-     */
-    public function forget($keys);
-
-    /**
-     * Remove all of the items from the session.
-     *
-     * @return void
-     */
-    public function flush();
-
-    /**
-     * Generate a new session ID for the session.
-     *
-     * @param  bool  $destroy
-     * @return bool
-     */
-    public function migrate($destroy = false);
-
-    /**
-     * Determine if the session has been started.
-     *
-     * @return bool
-     */
-    public function isStarted();
-
-    /**
-     * Get the previous URL from the session.
-     *
-     * @return string|null
-     */
-    public function previousUrl();
-
-    /**
-     * Set the "previous" URL in the session.
-     *
-     * @param  string  $url
-     * @return void
-     */
-    public function setPreviousUrl($url);
-
-    /**
-     * Get the session handler instance.
-     *
-     * @return \SessionHandlerInterface
-     */
-    public function getHandler();
-
-    /**
-     * Determine if the session handler needs a request.
-     *
-     * @return bool
-     */
-    public function handlerNeedsRequest();
-
-    /**
-     * Set the request on the handler instance.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     */
-    public function setRequestOnHandler($request);
+	/**
+	 * Get the name of the session.
+	 *
+	 * @return string
+	 */
+	public function getName();
+
+	/**
+	 * Get the current session ID.
+	 *
+	 * @return string
+	 */
+	public function getId();
+
+	/**
+	 * Set the session ID.
+	 *
+	 * @param  string  $id
+	 * @return void
+	 */
+	public function setId($id);
+
+	/**
+	 * Start the session, reading the data from a handler.
+	 *
+	 * @return bool
+	 */
+	public function start();
+
+	/**
+	 * Save the session data to storage.
+	 *
+	 * @return bool
+	 */
+	public function save();
+
+	/**
+	 * Get all of the session data.
+	 *
+	 * @return array
+	 */
+	public function all();
+
+	/**
+	 * Checks if a key exists.
+	 *
+	 * @param  string|array  $key
+	 * @return bool
+	 */
+	public function exists($key);
+
+	/**
+	 * Checks if an a key is present and not null.
+	 *
+	 * @param  string|array  $key
+	 * @return bool
+	 */
+	public function has($key);
+
+	/**
+	 * Get an item from the session.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $default
+	 * @return mixed
+	 */
+	public function get($key, $default = null);
+
+	/**
+	 * Put a key / value pair or array of key / value pairs in the session.
+	 *
+	 * @param  string|array  $key
+	 * @param  mixed       $value
+	 * @return void
+	 */
+	public function put($key, $value = null);
+
+	/**
+	 * Get the CSRF token value.
+	 *
+	 * @return string
+	 */
+	public function token();
+
+	/**
+	 * Remove an item from the session, returning its value.
+	 *
+	 * @param  string  $key
+	 * @return mixed
+	 */
+	public function remove($key);
+
+	/**
+	 * Remove one or many items from the session.
+	 *
+	 * @param  string|array  $keys
+	 * @return void
+	 */
+	public function forget($keys);
+
+	/**
+	 * Remove all of the items from the session.
+	 *
+	 * @return void
+	 */
+	public function flush();
+
+	/**
+	 * Generate a new session ID for the session.
+	 *
+	 * @param  bool  $destroy
+	 * @return bool
+	 */
+	public function migrate($destroy = false);
+
+	/**
+	 * Determine if the session has been started.
+	 *
+	 * @return bool
+	 */
+	public function isStarted();
+
+	/**
+	 * Get the previous URL from the session.
+	 *
+	 * @return string|null
+	 */
+	public function previousUrl();
+
+	/**
+	 * Set the "previous" URL in the session.
+	 *
+	 * @param  string  $url
+	 * @return void
+	 */
+	public function setPreviousUrl($url);
+
+	/**
+	 * Get the session handler instance.
+	 *
+	 * @return \SessionHandlerInterface
+	 */
+	public function getHandler();
+
+	/**
+	 * Determine if the session handler needs a request.
+	 *
+	 * @return bool
+	 */
+	public function handlerNeedsRequest();
+
+	/**
+	 * Set the request on the handler instance.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return void
+	 */
+	public function setRequestOnHandler($request);
 }

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
      * @param  string  $id
      * @return void
      */
-    public function setId($id);
+    public function setId( $id );
 
     /**
      * Start the session, reading the data from a handler.
@@ -59,7 +59,7 @@ 
      * @param  string|array  $key
      * @return bool
      */
-    public function exists($key);
+    public function exists( $key );
 
     /**
      * Checks if an a key is present and not null.
@@ -67,7 +67,7 @@ 
      * @param  string|array  $key
      * @return bool
      */
-    public function has($key);
+    public function has( $key );
 
     /**
      * Get an item from the session.
@@ -76,7 +76,7 @@ 
      * @param  mixed  $default
      * @return mixed
      */
-    public function get($key, $default = null);
+    public function get( $key, $default = null );
 
     /**
      * Put a key / value pair or array of key / value pairs in the session.
@@ -85,7 +85,7 @@ 
      * @param  mixed       $value
      * @return void
      */
-    public function put($key, $value = null);
+    public function put( $key, $value = null );
 
     /**
      * Get the CSRF token value.
@@ -100,7 +100,7 @@ 
      * @param  string  $key
      * @return mixed
      */
-    public function remove($key);
+    public function remove( $key );
 
     /**
      * Remove one or many items from the session.
@@ -108,7 +108,7 @@ 
      * @param  string|array  $keys
      * @return void
      */
-    public function forget($keys);
+    public function forget( $keys );
 
     /**
      * Remove all of the items from the session.
@@ -123,7 +123,7 @@ 
      * @param  bool  $destroy
      * @return bool
      */
-    public function migrate($destroy = false);
+    public function migrate( $destroy = false );
 
     /**
      * Determine if the session has been started.
@@ -145,7 +145,7 @@ 
      * @param  string  $url
      * @return void
      */
-    public function setPreviousUrl($url);
+    public function setPreviousUrl( $url );
 
     /**
      * Get the session handler instance.
@@ -167,5 +167,5 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @return void
      */
-    public function setRequestOnHandler($request);
+    public function setRequestOnHandler( $request );
 }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 
 namespace GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Session;
 
-interface Session
-{
+interface Session {
     /**
      * Get the name of the session.
      *

vendor_prefixed/illuminate/contracts/Queue/Monitor.php

Indentation +21 added lines, -21 removed lines

@@ -4,27 +4,27 @@
 
 interface Monitor
 {
-    /**
-     * Register a callback to be executed on every iteration through the queue loop.
-     *
-     * @param  mixed  $callback
-     * @return void
-     */
-    public function looping($callback);
+	/**
+	 * Register a callback to be executed on every iteration through the queue loop.
+	 *
+	 * @param  mixed  $callback
+	 * @return void
+	 */
+	public function looping($callback);
 
-    /**
-     * Register a callback to be executed when a job fails after the maximum amount of retries.
-     *
-     * @param  mixed  $callback
-     * @return void
-     */
-    public function failing($callback);
+	/**
+	 * Register a callback to be executed when a job fails after the maximum amount of retries.
+	 *
+	 * @param  mixed  $callback
+	 * @return void
+	 */
+	public function failing($callback);
 
-    /**
-     * Register a callback to be executed when a daemon queue is stopping.
-     *
-     * @param  mixed  $callback
-     * @return void
-     */
-    public function stopping($callback);
+	/**
+	 * Register a callback to be executed when a daemon queue is stopping.
+	 *
+	 * @param  mixed  $callback
+	 * @return void
+	 */
+	public function stopping($callback);
 }

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
      * @param  mixed  $callback
      * @return void
      */
-    public function looping($callback);
+    public function looping( $callback );
 
     /**
      * Register a callback to be executed when a job fails after the maximum amount of retries.
@@ -18,7 +18,7 @@ 
      * @param  mixed  $callback
      * @return void
      */
-    public function failing($callback);
+    public function failing( $callback );
 
     /**
      * Register a callback to be executed when a daemon queue is stopping.
@@ -26,5 +26,5 @@ 
      * @param  mixed  $callback
      * @return void
      */
-    public function stopping($callback);
+    public function stopping( $callback );
 }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 
 namespace GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Queue;
 
-interface Monitor
-{
+interface Monitor {
     /**
      * Register a callback to be executed on every iteration through the queue loop.
      *

vendor_prefixed/illuminate/contracts/Queue/EntityNotFoundException.php

Indentation +12 added lines, -12 removed lines

@@ -6,17 +6,17 @@
 
 class EntityNotFoundException extends InvalidArgumentException
 {
-    /**
-     * Create a new exception instance.
-     *
-     * @param  string  $type
-     * @param  mixed  $id
-     * @return void
-     */
-    public function __construct($type, $id)
-    {
-        $id = (string) $id;
+	/**
+	 * Create a new exception instance.
+	 *
+	 * @param  string  $type
+	 * @param  mixed  $id
+	 * @return void
+	 */
+	public function __construct($type, $id)
+	{
+		$id = (string) $id;
 
-        parent::__construct("Queueable entity [{$type}] not found for ID [{$id}].");
-    }
+		parent::__construct("Queueable entity [{$type}] not found for ID [{$id}].");
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -13,10 +13,10 @@
      * @param  mixed  $id
      * @return void
      */
-    public function __construct($type, $id)
+    public function __construct( $type, $id )
     {
-        $id = (string) $id;
+        $id = (string)$id;
 
-        parent::__construct("Queueable entity [{$type}] not found for ID [{$id}].");
+        parent::__construct( "Queueable entity [{$type}] not found for ID [{$id}]." );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -4,8 +4,7 @@ 
 
 use InvalidArgumentException;
 
-class EntityNotFoundException extends InvalidArgumentException
-{
+class EntityNotFoundException extends InvalidArgumentException {
     /**
      * Create a new exception instance.
      *
@@ -13,8 +12,7 @@ 
      * @param  mixed  $id
      * @return void
      */
-    public function __construct($type, $id)
-    {
+    public function __construct($type, $id) {
         $id = (string) $id;
 
         parent::__construct("Queueable entity [{$type}] not found for ID [{$id}].");

vendor_prefixed/illuminate/contracts/Queue/EntityResolver.php

Indentation +8 added lines, -8 removed lines

@@ -4,12 +4,12 @@
 
 interface EntityResolver
 {
-    /**
-     * Resolve the entity for the given ID.
-     *
-     * @param  string  $type
-     * @param  mixed  $id
-     * @return mixed
-     */
-    public function resolve($type, $id);
+	/**
+	 * Resolve the entity for the given ID.
+	 *
+	 * @param  string  $type
+	 * @param  mixed  $id
+	 * @return mixed
+	 */
+	public function resolve($type, $id);
 }

Spacing +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
      * @param  mixed  $id
      * @return mixed
      */
-    public function resolve($type, $id);
+    public function resolve( $type, $id );
 }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 
 namespace GravityKit\GravityView\Foundation\ThirdParty\Illuminate\Contracts\Queue;
 
-interface EntityResolver
-{
+interface EntityResolver {
     /**
      * Resolve the entity for the given ID.
      *