Merge branch 'remove-pointless-environment-interface' into 3.x

Closes #2625 Fixes #2548
slimphp · Apr 8, 2019 · f0718f6 · f0718f6
2 parents 14555a1 + b1c689b
commit f0718f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Slim/Container.php b/Slim/Container.php
@@ -21,7 +21,7 @@
  * with these service keys configured and ready for use:
  *
  *  - settings: an array or instance of \ArrayAccess
- *  - environment: an instance of \Slim\Interfaces\Http\EnvironmentInterface
+ *  - environment: an instance of \Slim\Http\Environment
  *  - request: an instance of \Psr\Http\Message\ServerRequestInterface
  *  - response: an instance of \Psr\Http\Message\ResponseInterface
  *  - router: an instance of \Slim\Interfaces\RouterInterface
@@ -32,7 +32,7 @@
  *  - callableResolver: an instance of \Slim\Interfaces\CallableResolverInterface
  *
  * @property-read array $settings
- * @property-read \Slim\Interfaces\Http\EnvironmentInterface $environment
+ * @property-read \Slim\Http\Environment $environment
  * @property-read \Psr\Http\Message\ServerRequestInterface $request
  * @property-read \Psr\Http\Message\ResponseInterface $response
  * @property-read \Slim\Interfaces\RouterInterface $router

diff --git a/Slim/DefaultServicesProvider.php b/Slim/DefaultServicesProvider.php
@@ -20,7 +20,6 @@
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\Http\EnvironmentInterface;
 use Slim\Interfaces\InvocationStrategyInterface;
 use Slim\Interfaces\RouterInterface;
 
@@ -39,9 +38,9 @@ public function register($container)
         if (!isset($container['environment'])) {
             /**
              * This service MUST return a shared instance
-             * of \Slim\Interfaces\Http\EnvironmentInterface.
+             * of \Slim\Http\Environment.
              *
-             * @return EnvironmentInterface
+             * @return Environment
              */
             $container['environment'] = function () {
                 return new Environment($_SERVER);