diff --git a/composer.json b/composer.json index 74cff7f..fa9b25d 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ "phpunit/phpunit-mock-objects": "dev-master#e60bb929c50ae4237aaf680a4f6773f4ee17f0a2", "zendframework/zend-feed": "2.2.*", "mikey179/vfsStream": "1.*", - "stack/builder": "1.0.*", "egulias/email-validator": "1.2.*" }, "autoload": { diff --git a/core/core.services.yml b/core/core.services.yml index 7abab67..f6f8067 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -394,13 +394,6 @@ services: arguments: ['@controller_resolver', '@string_translation'] http_kernel: class: Symfony\Component\HttpKernel\HttpKernel - factory_method: resolve - factory_service: http_kernel_factory - arguments: ['@http_kernel.basic'] - http_kernel_factory: - class: Stack\Builder - http_kernel.basic: - class: Symfony\Component\HttpKernel\HttpKernel arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack'] http_middleware.reverse_proxy: class: Drupal\Core\StackMiddleware\ReverseProxyMiddleware diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php index bf8efc0..56c563a 100644 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php +++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php @@ -9,6 +9,8 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\Reference; /** * Provides a compiler pass for stacked HTTP kernels. @@ -21,24 +23,41 @@ class StackedKernelPass implements CompilerPassInterface { * {@inheritdoc} */ public function process(ContainerBuilder $container) { - if (!$container->hasDefinition('http_kernel_factory')) { + + if (!$container->hasDefinition('http_kernel')) { return; } - $http_kernel_factory = $container->getDefinition('http_kernel_factory'); - $middleware_priorities = array(); - $middleware_arguments = array(); + $middlewares = array(); + $priorities = array(); + foreach ($container->findTaggedServiceIds('http_middleware') as $id => $attributes) { - $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0; - $middleware_priorities[$id] = $priority; - $definition = $container->getDefinition($id); - $middleware_arguments[$id] = $definition->getArguments(); - array_unshift($middleware_arguments[$id], $definition->getClass()); + $priorities[$id] = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0; + $middlewares[$id] = $container->getDefinition($id); + } + + if (empty($middlewares)) { + $container->addAliases(array('http_kernel_stack' => 'http_kernel')); } - array_multisort($middleware_priorities, SORT_DESC, $middleware_arguments, SORT_DESC); + else { + array_multisort($priorities, SORT_ASC, $middlewares); + + $previous_id = 'http_kernel'; + $first = $http_kernel = $container->getDefinition('http_kernel'); + + foreach ($middlewares as $id => $decorator) { + // Prepend the previous kernel as first constructor argument. + $arguments = $decorator->getArguments(); + array_unshift($arguments, new Reference($previous_id)); + $decorator->setArguments($arguments); + + $previous_id = $id; + $http_kernel = $decorator; + } - foreach ($middleware_arguments as $id => $push_arguments) { - $http_kernel_factory->addMethodCall('push', $push_arguments); + // Register the 'stack' service as being the very first one http stacked + // kernel that will decorate all others. + $container->addAliases(array('http_kernel_stack' => $id)); } } diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 8514448..0186e54 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -564,7 +564,7 @@ public function terminate(Request $request, Response $response) { */ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) { $this->boot(); - return $this->getHttpKernel()->handle($request, $type, $catch); + return $this->getHttpKernelStack()->handle($request, $type, $catch); } /** @@ -1148,6 +1148,15 @@ protected function getHttpKernel() { } /** + * Gets the http kernel stack from the container + * + * @return \Symfony\Component\HttpKernel\HttpKernelInterface + */ + protected function getHttpKernelStack() { + return $this->container->get('http_kernel_stack'); + } + + /** * Gets the PHP code storage object to use for the compiled container. * * @return \Drupal\Component\PhpStorage\PhpStorageInterface diff --git a/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php b/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php index 103f71f..dded3bf 100644 --- a/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php +++ b/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php @@ -40,7 +40,7 @@ protected function setUp() { public function testRequest() { $request = new Request(); /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel */ - $http_kernel = \Drupal::service('http_kernel'); + $http_kernel = \Drupal::service('http_kernel_stack'); $http_kernel->handle($request); $this->assertEqual($request->attributes->get('_hello'), 'world'); diff --git a/core/vendor/stack/builder/.travis.yml b/core/vendor/stack/builder/.travis.yml deleted file mode 100644 index 1d50df4..0000000 --- a/core/vendor/stack/builder/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: php - -php: - - 5.3.3 - - 5.3 - - 5.4 - - 5.5 - - hhvm - -before_script: - - composer self-update - - composer install --no-interaction --prefer-source - -script: phpunit --coverage-text - -matrix: - allow_failures: - - php: hhvm - fast_finish: true diff --git a/core/vendor/stack/builder/CHANGELOG.md b/core/vendor/stack/builder/CHANGELOG.md deleted file mode 100644 index f6f35d6..0000000 --- a/core/vendor/stack/builder/CHANGELOG.md +++ /dev/null @@ -1,14 +0,0 @@ -CHANGELOG -========= - -* 1.0.2 (2014-xx-xx) - - * Validate missing arguments (@bajbnet). - -* 1.0.1 (2013-10-25) - - * Lower PHP requirement to 5.3. - -* 1.0.0 (2013-08-02) - - * Initial release. diff --git a/core/vendor/stack/builder/LICENSE b/core/vendor/stack/builder/LICENSE deleted file mode 100644 index ceac72c..0000000 --- a/core/vendor/stack/builder/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2013 Igor Wiedler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/core/vendor/stack/builder/README.md b/core/vendor/stack/builder/README.md deleted file mode 100644 index 812406c..0000000 --- a/core/vendor/stack/builder/README.md +++ /dev/null @@ -1,62 +0,0 @@ -# Stack/Builder - -Builder for stack middlewares based on HttpKernelInterface. - -Stack/Builder is a small library that helps you construct a nested -HttpKernelInterface decorator tree. It models it as a stack of middlewares. - -## Example - -If you want to decorate a [silex](https://github.com/fabpot/Silex) app with -session and cache middlewares, you'll have to do something like this: - - use Symfony\Component\HttpKernel\HttpCache\Store; - - $app = new Silex\Application(); - - $app->get('/', function () { - return 'Hello World!'; - }); - - $app = new Stack\Session( - new Symfony\Component\HttpKernel\HttpCache\HttpCache( - $app, - new Store(__DIR__.'/cache') - ) - ); - -This can get quite annoying indeed. Stack/Builder simplifies that: - - $stack = (new Stack\Builder()) - ->push('Stack\Session') - ->push('Symfony\Component\HttpKernel\HttpCache\HttpCache', new Store(__DIR__.'/cache')); - - $app = $stack->resolve($app); - -As you can see, by arranging the layers as a stack, they become a lot easier -to work with. - -In the front controller, you need to serve the request: - - use Symfony\Component\HttpFoundation\Request; - - $request = Request::createFromGlobals(); - $response = $app->handle($request)->send(); - $app->terminate($request, $response); - -Stack/Builder also supports pushing a `callable` on to the stack, for situations -where instantiating middlewares might be more complicated. The `callable` should -accept a `HttpKernelInterface` as the first argument and should also return a -`HttpKernelInterface`. The example above could be rewritten as: - - $stack = (new Stack\Builder()) - ->push('Stack\Session') - ->push(function ($app) { - $cache = new HttpCache($app, new Store(__DIR__.'/cache')); - return $cache; - }); - -## Inspiration - -* [Rack::Builder](http://rack.rubyforge.org/doc/Rack/Builder.html) -* [HttpKernel middlewares](https://igor.io/2013/02/02/http-kernel-middlewares.html) diff --git a/core/vendor/stack/builder/composer.json b/core/vendor/stack/builder/composer.json deleted file mode 100644 index e9f164c..0000000 --- a/core/vendor/stack/builder/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "stack/builder", - "description": "Builder for stack middlewares based on HttpKernelInterface.", - "keywords": ["stack"], - "license": "MIT", - "authors": [ - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - } - ], - "require": { - "php": ">=5.3.0", - "symfony/http-foundation": "~2.1", - "symfony/http-kernel": "~2.1" - }, - "require-dev": { - "silex/silex": "~1.0" - }, - "autoload": { - "psr-0": { "Stack": "src" } - }, - "extra": { - "branch-alias": { "dev-master": "1.0-dev" } - } -} diff --git a/core/vendor/stack/builder/composer.lock b/core/vendor/stack/builder/composer.lock deleted file mode 100644 index 26c6a99..0000000 --- a/core/vendor/stack/builder/composer.lock +++ /dev/null @@ -1,488 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" - ], - "hash": "78698481679eca710495d5aca028baaa", - "packages": [ - { - "name": "psr/log", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-0": { - "Psr\\Log\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2012-12-21 11:40:51" - }, - { - "name": "symfony/debug", - "version": "v2.4.1", - "target-dir": "Symfony/Component/Debug", - "source": { - "type": "git", - "url": "https://github.com/symfony/Debug.git", - "reference": "74110be5ec681a83fc5bd66dd5fd29fe85fe9c1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/74110be5ec681a83fc5bd66dd5fd29fe85fe9c1f", - "reference": "74110be5ec681a83fc5bd66dd5fd29fe85fe9c1f", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "symfony/http-foundation": "~2.1", - "symfony/http-kernel": "~2.1" - }, - "suggest": { - "symfony/http-foundation": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Debug\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "http://symfony.com", - "time": "2014-01-01 09:02:49" - }, - { - "name": "symfony/event-dispatcher", - "version": "v2.4.1", - "target-dir": "Symfony/Component/EventDispatcher", - "source": { - "type": "git", - "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e3ba42f6a70554ed05749e61b829550f6ac33601", - "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "symfony/dependency-injection": "~2.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\EventDispatcher\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com", - "time": "2013-12-28 08:12:03" - }, - { - "name": "symfony/http-foundation", - "version": "v2.4.1", - "target-dir": "Symfony/Component/HttpFoundation", - "source": { - "type": "git", - "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6c6b8a7bcd7e2cc920cd6acace563fdbf121d844", - "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "classmap": [ - "Symfony/Component/HttpFoundation/Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony HttpFoundation Component", - "homepage": "http://symfony.com", - "time": "2014-01-05 02:10:50" - }, - { - "name": "symfony/http-kernel", - "version": "v2.4.1", - "target-dir": "Symfony/Component/HttpKernel", - "source": { - "type": "git", - "url": "https://github.com/symfony/HttpKernel.git", - "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0605eedeb52c4d3a3144128d8336395a57be60d4", - "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "psr/log": "~1.0", - "symfony/debug": "~2.3", - "symfony/event-dispatcher": "~2.1", - "symfony/http-foundation": "~2.4" - }, - "require-dev": { - "symfony/browser-kit": "~2.2", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.0", - "symfony/console": "~2.2", - "symfony/dependency-injection": "~2.0", - "symfony/finder": "~2.0", - "symfony/process": "~2.0", - "symfony/routing": "~2.2", - "symfony/stopwatch": "~2.2", - "symfony/templating": "~2.2" - }, - "suggest": { - "symfony/browser-kit": "", - "symfony/class-loader": "", - "symfony/config": "", - "symfony/console": "", - "symfony/dependency-injection": "", - "symfony/finder": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\HttpKernel\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony HttpKernel Component", - "homepage": "http://symfony.com", - "time": "2014-01-05 02:12:11" - } - ], - "packages-dev": [ - { - "name": "pimple/pimple", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/fabpot/Pimple.git", - "reference": "471c7d7c52ad6594e17b8ec33efdd1be592b5d83" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/471c7d7c52ad6594e17b8ec33efdd1be592b5d83", - "reference": "471c7d7c52ad6594e17b8ec33efdd1be592b5d83", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Pimple": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", - "homepage": "http://pimple.sensiolabs.org", - "keywords": [ - "container", - "dependency injection" - ], - "time": "2013-09-19 04:53:08" - }, - { - "name": "silex/silex", - "version": "v1.1.2", - "source": { - "type": "git", - "url": "https://github.com/silexphp/Silex.git", - "reference": "47cc7d6545450ef8a91f50c04e8c7b3b04fceae9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/silexphp/Silex/zipball/47cc7d6545450ef8a91f50c04e8c7b3b04fceae9", - "reference": "47cc7d6545450ef8a91f50c04e8c7b3b04fceae9", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "pimple/pimple": "~1.0", - "symfony/event-dispatcher": ">=2.3,<2.5-dev", - "symfony/http-foundation": ">=2.3,<2.5-dev", - "symfony/http-kernel": ">=2.3,<2.5-dev", - "symfony/routing": ">=2.3,<2.5-dev" - }, - "require-dev": { - "doctrine/dbal": ">=2.2.0,<2.4.0-dev", - "monolog/monolog": "~1.4,>=1.4.1", - "phpunit/phpunit": "~3.7", - "swiftmailer/swiftmailer": "5.*", - "symfony/browser-kit": ">=2.3,<2.5-dev", - "symfony/config": ">=2.3,<2.5-dev", - "symfony/css-selector": ">=2.3,<2.5-dev", - "symfony/debug": ">=2.3,<2.5-dev", - "symfony/dom-crawler": ">=2.3,<2.5-dev", - "symfony/finder": ">=2.3,<2.5-dev", - "symfony/form": ">=2.3,<2.5-dev", - "symfony/locale": ">=2.3,<2.5-dev", - "symfony/monolog-bridge": ">=2.3,<2.5-dev", - "symfony/options-resolver": ">=2.3,<2.5-dev", - "symfony/process": ">=2.3,<2.5-dev", - "symfony/security": ">=2.3,<2.5-dev", - "symfony/serializer": ">=2.3,<2.5-dev", - "symfony/translation": ">=2.3,<2.5-dev", - "symfony/twig-bridge": ">=2.3,<2.5-dev", - "symfony/validator": ">=2.3,<2.5-dev", - "twig/twig": ">=1.8.0,<2.0-dev" - }, - "suggest": { - "symfony/browser-kit": ">=2.3,<2.5-dev", - "symfony/css-selector": ">=2.3,<2.5-dev", - "symfony/dom-crawler": ">=2.3,<2.5-dev", - "symfony/form": ">=2.3,<2.5-dev" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Silex": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch", - "homepage": "http://wiedler.ch/igor/" - } - ], - "description": "The PHP micro-framework based on the Symfony2 Components", - "homepage": "http://silex.sensiolabs.org", - "keywords": [ - "microframework" - ], - "time": "2013-10-30 08:53:26" - }, - { - "name": "symfony/routing", - "version": "v2.4.1", - "target-dir": "Symfony/Component/Routing", - "source": { - "type": "git", - "url": "https://github.com/symfony/Routing.git", - "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/4abfb500aab8be458c9e3a227ea56b190584f78a", - "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "psr/log": "~1.0", - "symfony/config": "~2.2", - "symfony/expression-language": "~2.4", - "symfony/yaml": "~2.0" - }, - "suggest": { - "doctrine/annotations": "For using the annotation loader", - "symfony/config": "For using the all-in-one router or any loader", - "symfony/expression-language": "For using expression matching", - "symfony/yaml": "For using the YAML loader" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Routing\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Routing Component", - "homepage": "http://symfony.com", - "keywords": [ - "router", - "routing", - "uri", - "url" - ], - "time": "2014-01-05 02:10:50" - } - ], - "aliases": [ - - ], - "minimum-stability": "stable", - "stability-flags": [ - - ], - "platform": { - "php": ">=5.3.0" - }, - "platform-dev": [ - - ] -} diff --git a/core/vendor/stack/builder/phpunit.xml.dist b/core/vendor/stack/builder/phpunit.xml.dist deleted file mode 100644 index a2437ec..0000000 --- a/core/vendor/stack/builder/phpunit.xml.dist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ./tests/unit/ - - - - - - ./tests/integration/ - - - - - - ./tests/functional/ - - - - - - ./src/ - - - diff --git a/core/vendor/stack/builder/src/Stack/Builder.php b/core/vendor/stack/builder/src/Stack/Builder.php deleted file mode 100644 index c7ee05a..0000000 --- a/core/vendor/stack/builder/src/Stack/Builder.php +++ /dev/null @@ -1,63 +0,0 @@ -specs = new \SplStack(); - } - - public function unshift(/*$kernelClass, $args...*/) - { - if (func_num_args() === 0) { - throw new \InvalidArgumentException("Missing argument(s) when calling unshift"); - } - - $spec = func_get_args(); - $this->specs->unshift($spec); - - return $this; - } - - public function push(/*$kernelClass, $args...*/) - { - if (func_num_args() === 0) { - throw new \InvalidArgumentException("Missing argument(s) when calling push"); - } - - $spec = func_get_args(); - $this->specs->push($spec); - - return $this; - } - - public function resolve(HttpKernelInterface $app) - { - $middlewares = array($app); - - foreach ($this->specs as $spec) { - $args = $spec; - $firstArg = array_shift($args); - - if (is_callable($firstArg)) { - $app = $firstArg($app); - } else { - $kernelClass = $firstArg; - array_unshift($args, $app); - - $reflection = new \ReflectionClass($kernelClass); - $app = $reflection->newInstanceArgs($args); - } - - array_unshift($middlewares, $app); - } - - return new StackedHttpKernel($app, $middlewares); - } -} diff --git a/core/vendor/stack/builder/src/Stack/StackedHttpKernel.php b/core/vendor/stack/builder/src/Stack/StackedHttpKernel.php deleted file mode 100644 index 2b96dd9..0000000 --- a/core/vendor/stack/builder/src/Stack/StackedHttpKernel.php +++ /dev/null @@ -1,34 +0,0 @@ -app = $app; - $this->middlewares = $middlewares; - } - - public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true) - { - return $this->app->handle($request, $type, $catch); - } - - public function terminate(Request $request, Response $response) - { - foreach ($this->middlewares as $kernel) { - if ($kernel instanceof TerminableInterface) { - $kernel->terminate($request, $response); - } - } - } -} diff --git a/core/vendor/stack/builder/tests/functional/SilexApplicationTest.php b/core/vendor/stack/builder/tests/functional/SilexApplicationTest.php deleted file mode 100644 index 5636336..0000000 --- a/core/vendor/stack/builder/tests/functional/SilexApplicationTest.php +++ /dev/null @@ -1,60 +0,0 @@ -get('/foo', function () { - return 'bar'; - }); - - $finished = false; - - $app->finish(function () use (&$finished) { - $finished = true; - }); - - $stack = new Builder(); - $stack - ->push('functional\Append', '.A') - ->push('functional\Append', '.B'); - - $app = $stack->resolve($app); - - $request = Request::create('/foo'); - $response = $app->handle($request); - $app->terminate($request, $response); - - $this->assertSame('bar.B.A', $response->getContent()); - $this->assertTrue($finished); - } -} - -class Append implements HttpKernelInterface -{ - private $app; - private $appendix; - - public function __construct(HttpKernelInterface $app, $appendix) - { - $this->app = $app; - $this->appendix = $appendix; - } - - public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true) - { - $response = clone $this->app->handle($request, $type, $catch); - $response->setContent($response->getContent().$this->appendix); - - return $response; - } -} diff --git a/core/vendor/stack/builder/tests/unit/Stack/BuilderTest.php b/core/vendor/stack/builder/tests/unit/Stack/BuilderTest.php deleted file mode 100644 index 4092d01..0000000 --- a/core/vendor/stack/builder/tests/unit/Stack/BuilderTest.php +++ /dev/null @@ -1,215 +0,0 @@ -getHttpKernelMock(new Response('ok')); - - $stack = new Builder(); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = $resolved->handle($request); - - $this->assertInstanceOf('Stack\StackedHttpKernel', $resolved); - $this->assertSame('ok', $response->getContent()); - } - - /** @test */ - public function resolvedKernelShouldDelegateTerminateCalls() - { - $app = $this->getTerminableMock(); - - $stack = new Builder(); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = new Response('ok'); - - $resolved->handle($request); - $resolved->terminate($request, $response); - } - - /** @test */ - public function pushShouldReturnSelf() - { - $stack = new Builder(); - $this->assertSame($stack, $stack->push('Stack\AppendA')); - } - - /** @test */ - public function pushShouldThrowOnInvalidInput() - { - $this->setExpectedException('InvalidArgumentException', 'Missing argument(s) when calling push'); - $stack = new Builder(); - $stack->push(); - } - - /** @test */ - public function unshiftShouldReturnSelf() - { - $stack = new Builder(); - $this->assertSame($stack, $stack->unshift('Stack\AppendA')); - } - - /** @test */ - public function unshiftShouldThrowOnInvalidInput() - { - $this->setExpectedException('InvalidArgumentException', 'Missing argument(s) when calling unshift'); - $stack = new Builder(); - $stack->unshift(); - } - - /** @test */ - public function appendMiddlewareShouldAppendToBody() - { - $app = $this->getHttpKernelMock(new Response('ok')); - - $stack = new Builder(); - $stack->push('Stack\AppendA'); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = $resolved->handle($request); - - $this->assertSame('ok.A', $response->getContent()); - } - - /** @test */ - public function unshiftMiddlewareShouldPutMiddlewareBeforePushed() - { - $app = $this->getHttpKernelMock(new Response('ok')); - - $stack = new Builder(); - $stack->push('Stack\Append', '2.'); - $stack->unshift('Stack\Append', '1.'); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = $resolved->handle($request); - - $this->assertSame('ok2.1.', $response->getContent()); - } - - /** @test */ - public function stackedMiddlewaresShouldWrapInReverseOrder() - { - $app = $this->getHttpKernelMock(new Response('ok')); - - $stack = new Builder(); - $stack->push('Stack\AppendA'); - $stack->push('Stack\AppendB'); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = $resolved->handle($request); - - $this->assertSame('ok.B.A', $response->getContent()); - } - - /** @test */ - public function resolveShouldPassPushArgumentsToMiddlewareConstructor() - { - $app = $this->getHttpKernelMock(new Response('ok')); - - $stack = new Builder(); - $stack->push('Stack\Append', '.foo'); - $stack->push('Stack\Append', '.bar'); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = $resolved->handle($request); - - $this->assertSame('ok.bar.foo', $response->getContent()); - } - - /** @test */ - public function resolveShouldCallSpecFactories() - { - $app = $this->getHttpKernelMock(new Response('ok')); - - $stack = new Builder(); - $stack->push(function ($app) { return new Append($app, '.foo'); }); - $stack->push(function ($app) { return new Append($app, '.bar'); }); - $resolved = $stack->resolve($app); - - $request = Request::create('/'); - $response = $resolved->handle($request); - - $this->assertSame('ok.bar.foo', $response->getContent()); - } - - private function getHttpKernelMock(Response $response) - { - $app = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'); - $app->expects($this->any()) - ->method('handle') - ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request')) - ->will($this->returnValue($response)); - - return $app; - } - - private function getTerminableMock() - { - $app = $this->getMock('Stack\TerminableHttpKernel'); - $app->expects($this->once()) - ->method('terminate') - ->with( - $this->isInstanceOf('Symfony\Component\HttpFoundation\Request'), - $this->isInstanceOf('Symfony\Component\HttpFoundation\Response') - ); - - return $app; - } -} - -abstract class TerminableHttpKernel implements HttpKernelInterface, TerminableInterface -{ -} - -class Append implements HttpKernelInterface -{ - private $app; - private $appendix; - - public function __construct(HttpKernelInterface $app, $appendix) - { - $this->app = $app; - $this->appendix = $appendix; - } - - public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true) - { - $response = clone $this->app->handle($request, $type, $catch); - $response->setContent($response->getContent().$this->appendix); - - return $response; - } -} - -class AppendA extends Append -{ - public function __construct(HttpKernelInterface $app) - { - parent::__construct($app, '.A'); - } -} - -class AppendB extends Append -{ - public function __construct(HttpKernelInterface $app) - { - parent::__construct($app, '.B'); - } -} diff --git a/core/vendor/stack/builder/tests/unit/Stack/StackedHttpKernelTest.php b/core/vendor/stack/builder/tests/unit/Stack/StackedHttpKernelTest.php deleted file mode 100644 index e2ced54..0000000 --- a/core/vendor/stack/builder/tests/unit/Stack/StackedHttpKernelTest.php +++ /dev/null @@ -1,80 +0,0 @@ -getHttpKernelMock(new Response('ok')); - $kernel = new StackedHttpKernel($app, array($app)); - - $request = Request::create('/'); - $response = $kernel->handle($request); - - $this->assertSame('ok', $response->getContent()); - } - - /** @test */ - public function handleShouldStillDelegateToAppWithMiddlewares() - { - $app = $this->getHttpKernelMock(new Response('ok')); - $foo = $this->getHttpKernelMock(new Response('foo')); - $bar = $this->getHttpKernelMock(new Response('bar')); - $kernel = new StackedHttpKernel($app, array($app, $foo, $bar)); - - $request = Request::create('/'); - $response = $kernel->handle($request); - - $this->assertSame('ok', $response->getContent()); - } - - /** @test */ - public function terminateShouldDelegateToMiddlewares() - { - $app = $this->getTerminableMock(new Response('ok')); - $foo = $this->getTerminableMock(); - $bar = $this->getTerminableMock(); - $kernel = new StackedHttpKernel($app, array($app, $foo, $bar)); - - $request = Request::create('/'); - $response = $kernel->handle($request); - $kernel->terminate($request, $response); - } - - private function getHttpKernelMock(Response $response) - { - $app = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'); - $app->expects($this->any()) - ->method('handle') - ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request')) - ->will($this->returnValue($response)); - - return $app; - } - - private function getTerminableMock(Response $response = null) - { - $app = $this->getMock('Stack\TerminableHttpKernel'); - if ($response) { - $app->expects($this->any()) - ->method('handle') - ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request')) - ->will($this->returnValue($response)); - } - $app->expects($this->once()) - ->method('terminate') - ->with( - $this->isInstanceOf('Symfony\Component\HttpFoundation\Request'), - $this->isInstanceOf('Symfony\Component\HttpFoundation\Response') - ); - - return $app; - } -}