Merge pull request #2221 from akrabat/slim-http

Depend on Slim-Http
slimphp · May 17, 2017 · 72eea92 · 72eea92
2 parents 7e690d7 + a7362be
commit 72eea92
Show file tree

Hide file tree

Showing 32 changed files with 101 additions and 8,468 deletions.
diff --git a/Slim/Container.php b/Slim/Container.php
@@ -21,7 +21,6 @@
  * with these service keys configured and ready for use:
  *
  *  - settings: an array or instance of \ArrayAccess
- *  - environment: an instance of \Slim\Interfaces\Http\EnvironmentInterface
  *  - 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 +31,6 @@
  *  - callableResolver: an instance of \Slim\Interfaces\CallableResolverInterface
  *
  * @property-read array settings
- * @property-read \Slim\Interfaces\Http\EnvironmentInterface 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;
 
@@ -36,18 +35,6 @@ class DefaultServicesProvider
      */
     public function register($container)
     {
-        if (!isset($container['environment'])) {
-            /**
-             * This service MUST return a shared instance
-             * of \Slim\Interfaces\Http\EnvironmentInterface.
-             *
-             * @return EnvironmentInterface
-             */
-            $container['environment'] = function () {
-                return new Environment($_SERVER);
-            };
-        }
-
         if (!isset($container['request'])) {
             /**
              * PSR-7 Request object
@@ -57,7 +44,7 @@ public function register($container)
              * @return ServerRequestInterface
              */
             $container['request'] = function ($container) {
-                return Request::createFromEnvironment($container->get('environment'));
+                return Request::createFromGlobals($_SERVER);
             };
         }
 

diff --git a/Slim/Http/Body.php b/Slim/Http/Body.php
diff --git a/Slim/Http/Cookies.php b/Slim/Http/Cookies.php
diff --git a/Slim/Http/Environment.php b/Slim/Http/Environment.php