From a6068b06ba42700f25b613a7bc3036be75d5bc43 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 29 Jun 2017 08:14:06 -0500 Subject: [PATCH] formatting --- src/Illuminate/Container/Container.php | 40 +++++++++---------- .../Container/EntryNotFoundException.php | 1 + src/Illuminate/Contracts/composer.json | 3 +- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php index 2d275916c3c2..31989d4c0ccb 100755 --- a/src/Illuminate/Container/Container.php +++ b/src/Illuminate/Container/Container.php @@ -155,6 +155,14 @@ public function bound($abstract) $this->isAlias($abstract); } + /** + * {@inheritdoc} + */ + public function has($id) + { + return $this->bound($id); + } + /** * Determine if the given abstract type has been resolved. * @@ -578,6 +586,18 @@ public function make($abstract, array $parameters = []) return $this->resolve($abstract, $parameters); } + /** + * {@inheritdoc} + */ + public function get($id) + { + if ($this->has($id)) { + return $this->resolve($id); + } + + throw new EntryNotFoundException; + } + /** * Resolve the given type from the container. * @@ -1222,24 +1242,4 @@ public function __set($key, $value) { $this[$key] = $value; } - - /** - * {@inheritdoc} - */ - public function get($id) - { - if ($this->has($id)) { - return $this->resolve($id); - } - - throw new EntryNotFoundException(); - } - - /** - * {@inheritdoc} - */ - public function has($id) - { - return $this->bound($id); - } } diff --git a/src/Illuminate/Container/EntryNotFoundException.php b/src/Illuminate/Container/EntryNotFoundException.php index bdcb6401d78c..42669214f239 100644 --- a/src/Illuminate/Container/EntryNotFoundException.php +++ b/src/Illuminate/Container/EntryNotFoundException.php @@ -7,4 +7,5 @@ class EntryNotFoundException extends Exception implements NotFoundExceptionInterface { + // } diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json index c833ea152cd2..c34277664037 100644 --- a/src/Illuminate/Contracts/composer.json +++ b/src/Illuminate/Contracts/composer.json @@ -14,7 +14,8 @@ } ], "require": { - "php": ">=7.0" + "php": ">=7.0", + "psr/container": "~1.0" }, "autoload": { "psr-4": {