From db415e2369ccaac69414a84ac57bd2b45454743c Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 08:38:40 +0000 Subject: [PATCH 01/22] Migrate Silex to 2.0 --- composer.json | 3 +- composer.lock | 630 +++++++++++++------- src/React/Espresso/ControllerCollection.php | 2 +- src/React/Espresso/Stack.php | 15 +- 4 files changed, 420 insertions(+), 230 deletions(-) diff --git a/composer.json b/composer.json index 9b97706..d95594c 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,8 @@ "require": { "php": ">=5.3.3", "react/http": "0.2.*", - "silex/silex": "1.0.*@dev" + "silex/silex": "2.0", + "pimple/pimple": "^3.0" }, "autoload": { "psr-0": { "React\\Espresso": "src" } diff --git a/composer.lock b/composer.lock index d7136b4..5d9ef82 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_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", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d4cf6de577e04afb0122b0d2e761e06b", + "content-hash": "c61b2bc342e37ec8cee969d49418a7df", "packages": [ { "name": "evenement/evenement", "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/igorw/evenement", - "reference": "v1.0.0" + "url": "https://github.com/igorw/evenement.git", + "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d" }, "dist": { "type": "zip", - "url": "https://github.com/igorw/evenement/zipball/v1.0.0", - "reference": "v1.0.0", + "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d", + "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d", "shasum": "" }, "require": { @@ -29,6 +29,7 @@ "Evenement": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -43,71 +44,81 @@ "keywords": [ "event-dispatcher" ], - "time": "2012-05-30 08:01:08" + "time": "2012-05-30T15:01:08+00:00" }, { "name": "guzzle/common", - "version": "v2.8.8", + "version": "v3.0.7", "target-dir": "Guzzle/Common", "source": { "type": "git", - "url": "git://github.com/guzzle/common.git", - "reference": "v2.8.8" + "url": "https://github.com/Guzzle3/common.git", + "reference": "b7c6ec11fb5f141c31fea22844aac2343db853f4" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/common/zipball/v2.8.8", - "reference": "v2.8.8", + "url": "https://api.github.com/repos/Guzzle3/common/zipball/b7c6ec11fb5f141c31fea22844aac2343db853f4", + "reference": "b7c6ec11fb5f141c31fea22844aac2343db853f4", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": "2.1.*" + "symfony/event-dispatcher": ">=2.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { "psr-0": { "Guzzle\\Common": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "Common libraries used by Guzzle", "homepage": "http://guzzlephp.org/", "keywords": [ - "Socket", - "batch", - "cache", + "collection", "common", "event", - "inflection", - "log", - "validation" + "exception" ], - "time": "2012-10-15 17:42:47" + "abandoned": "guzzle/guzzle", + "time": "2012-12-19T23:06:35+00:00" }, { "name": "guzzle/http", - "version": "v2.8.8", + "version": "v3.0.7", "target-dir": "Guzzle/Http", "source": { "type": "git", - "url": "https://github.com/guzzle/http.git", - "reference": "1fe3a2cf45b2984934d8a74e2bb4bd6a1de9c357" + "url": "https://github.com/Guzzle3/http.git", + "reference": "eea92ef701a69b48d1e37fc9dd79058d41aeec93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/http/zipball/1fe3a2cf45b2984934d8a74e2bb4bd6a1de9c357", - "reference": "1fe3a2cf45b2984934d8a74e2bb4bd6a1de9c357", + "url": "https://api.github.com/repos/Guzzle3/http/zipball/eea92ef701a69b48d1e37fc9dd79058d41aeec93", + "reference": "eea92ef701a69b48d1e37fc9dd79058d41aeec93", "shasum": "" }, "require": { + "ext-curl": "*", "guzzle/common": "self.version", "guzzle/parser": "self.version", + "guzzle/stream": "self.version", "php": ">=5.3.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { "psr-0": { "Guzzle\\Http": "" @@ -117,6 +128,13 @@ "license": [ "MIT" ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], "description": "HTTP libraries used by Guzzle", "homepage": "http://guzzlephp.org/", "keywords": [ @@ -126,27 +144,33 @@ "http", "http client" ], - "time": "2012-10-16 00:42:47" + "abandoned": "guzzle/guzzle", + "time": "2012-12-14T00:49:17+00:00" }, { "name": "guzzle/parser", - "version": "v2.8.8", + "version": "v3.0.7", "target-dir": "Guzzle/Parser", "source": { "type": "git", - "url": "https://github.com/guzzle/parser.git", - "reference": "8f5152833af2d9505bcefb0a10c4b6987aa9a6b1" + "url": "https://github.com/Guzzle3/parser.git", + "reference": "8a1f6829d75274de16232cb327597db3067a2074" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/parser/zipball/8f5152833af2d9505bcefb0a10c4b6987aa9a6b1", - "reference": "8f5152833af2d9505bcefb0a10c4b6987aa9a6b1", + "url": "https://api.github.com/repos/Guzzle3/parser/zipball/8a1f6829d75274de16232cb327597db3067a2074", + "reference": "8a1f6829d75274de16232cb327597db3067a2074", "shasum": "" }, "require": { "php": ">=5.3.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "autoload": { "psr-0": { "Guzzle\\Parser": "" @@ -165,20 +189,72 @@ "message", "url" ], - "time": "2012-09-20 20:28:06" + "abandoned": "guzzle/guzzle", + "time": "2012-12-07T16:45:11+00:00" + }, + { + "name": "guzzle/stream", + "version": "v3.0.7", + "target-dir": "Guzzle/Stream", + "source": { + "type": "git", + "url": "https://github.com/Guzzle3/stream.git", + "reference": "c499757c760159188a9573362b8086ef25e6734e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Guzzle3/stream/zipball/c499757c760159188a9573362b8086ef25e6734e", + "reference": "c499757c760159188a9573362b8086ef25e6734e", + "shasum": "" + }, + "require": { + "guzzle/common": "self.version", + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle\\Stream": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle stream wrapper component", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "Guzzle", + "component", + "stream" + ], + "abandoned": "guzzle/guzzle", + "time": "2012-12-07T16:45:11+00:00" }, { "name": "pimple/pimple", - "version": "v1.1.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d" + "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d", - "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a30f7d6e57565a2e1a316e1baf2a483f788b258a", + "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a", "shasum": "" }, "require": { @@ -187,12 +263,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { "psr-0": { - "Pimple": "lib/" + "Pimple": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -205,32 +281,40 @@ "email": "fabien@symfony.com" } ], - "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", + "description": "Pimple, a simple Dependency Injection Container", "homepage": "http://pimple.sensiolabs.org", "keywords": [ "container", "dependency injection" ], - "time": "2013-11-22 08:30:29" + "time": "2015-09-11T15:10:35+00:00" }, { "name": "psr/log", - "version": "1.0.0", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -244,12 +328,13 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "react/event-loop", @@ -292,32 +377,34 @@ "keywords": [ "event-loop" ], - "time": "2013-01-05 11:41:26" + "time": "2013-01-05T11:41:26+00:00" }, { "name": "react/http", - "version": "v0.2.2", + "version": "v0.2.6", "target-dir": "React/Http", "source": { "type": "git", "url": "https://github.com/reactphp/http.git", - "reference": "43badbc510d416a482fe967eb300137bf7f7f18b" + "reference": "5e920f734f4065de1582c125b4bf35128279972f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/http/zipball/43badbc510d416a482fe967eb300137bf7f7f18b", - "reference": "43badbc510d416a482fe967eb300137bf7f7f18b", + "url": "https://api.github.com/repos/reactphp/http/zipball/5e920f734f4065de1582c125b4bf35128279972f", + "reference": "5e920f734f4065de1582c125b4bf35128279972f", "shasum": "" }, "require": { - "guzzle/http": "2.8.*", - "guzzle/parser": "2.8.*", + "guzzle/http": "3.0.*", + "guzzle/parser": "3.0.*", "php": ">=5.3.3", "react/socket": "0.2.*" }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "0.2-dev" + } }, "autoload": { "psr-0": { @@ -332,7 +419,7 @@ "keywords": [ "http" ], - "time": "2012-10-28 10:28:35" + "time": "2012-12-26T16:33:04+00:00" }, { "name": "react/socket", @@ -374,21 +461,21 @@ "keywords": [ "Socket" ], - "time": "2012-12-14 00:58:14" + "time": "2012-12-14T00:58:14+00:00" }, { "name": "react/stream", - "version": "v0.2.1", + "version": "v0.2.6", "target-dir": "React/Stream", "source": { "type": "git", - "url": "https://github.com/reactphp/stream", - "reference": "v0.2.1" + "url": "https://github.com/reactphp/stream.git", + "reference": "34c1059cffb44873440135e9a86fe9ae9caf5acd" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/stream/zipball/v0.2.1", - "reference": "v0.2.1", + "url": "https://api.github.com/repos/reactphp/stream/zipball/34c1059cffb44873440135e9a86fe9ae9caf5acd", + "reference": "34c1059cffb44873440135e9a86fe9ae9caf5acd", "shasum": "" }, "require": { @@ -396,17 +483,21 @@ "php": ">=5.3.3" }, "suggest": { - "react/event-loop": "0.2.*" + "react/event-loop": "0.2.*", + "react/promise": "1.0.*" }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "0.2-dev" + } }, "autoload": { "psr-0": { "React\\Stream": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -415,66 +506,69 @@ "pipe", "stream" ], - "time": "2012-10-13 13:12:04" + "time": "2012-12-14T00:58:14+00:00" }, { "name": "silex/silex", - "version": "1.0.x-dev", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/silexphp/Silex.git", - "reference": "75b8714f00bf4e64eedc0d9283b03eb05af67196" + "reference": "23598ae94fc3ce631c0162079f06779cde5f0a3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Silex/zipball/75b8714f00bf4e64eedc0d9283b03eb05af67196", - "reference": "75b8714f00bf4e64eedc0d9283b03eb05af67196", + "url": "https://api.github.com/repos/silexphp/Silex/zipball/23598ae94fc3ce631c0162079f06779cde5f0a3f", + "reference": "23598ae94fc3ce631c0162079f06779cde5f0a3f", "shasum": "" }, "require": { - "php": ">=5.3.3", - "pimple/pimple": "1.*", - "symfony/event-dispatcher": ">=2.1,<2.4-dev", - "symfony/http-foundation": ">=2.1,<2.4-dev", - "symfony/http-kernel": ">=2.1,<2.4-dev", - "symfony/routing": ">=2.1,<2.4-dev" + "php": ">=5.5.9", + "pimple/pimple": "~3.0", + "symfony/event-dispatcher": "~2.8|3.0.*", + "symfony/http-foundation": "~2.8|3.0.*", + "symfony/http-kernel": "~2.8|3.0.*", + "symfony/routing": "~2.8|3.0.*" }, - "require-dev": { - "doctrine/dbal": ">=2.2.0,<2.4.0-dev", - "monolog/monolog": "~1.4,>=1.4.1", - "swiftmailer/swiftmailer": "5.*", - "symfony/browser-kit": ">=2.1,<2.4-dev", - "symfony/config": ">=2.1,<2.4-dev", - "symfony/css-selector": ">=2.1,<2.4-dev", - "symfony/dom-crawler": ">=2.1,<2.4-dev", - "symfony/finder": ">=2.1,<2.4-dev", - "symfony/form": ">=2.1.4,<2.4-dev", - "symfony/locale": ">=2.1,<2.4-dev", - "symfony/monolog-bridge": ">=2.1,<2.4-dev", - "symfony/options-resolver": ">=2.1,<2.4-dev", - "symfony/process": ">=2.1,<2.4-dev", - "symfony/security": ">=2.1,<2.4-dev", - "symfony/serializer": ">=2.1,<2.4-dev", - "symfony/translation": ">=2.1,<2.4-dev", - "symfony/twig-bridge": ">=2.1,<2.4-dev", - "symfony/validator": ">=2.1,<2.4-dev", - "twig/twig": ">=1.8.0,<2.0-dev" + "replace": { + "silex/api": "self.version", + "silex/providers": "self.version" }, - "suggest": { - "symfony/browser-kit": ">=2.1,<2.4-dev", - "symfony/css-selector": ">=2.1,<2.4-dev", - "symfony/dom-crawler": ">=2.1,<2.4-dev", - "symfony/form": ">= 2.1.4,<2.4-dev" + "require-dev": { + "doctrine/dbal": "~2.2", + "monolog/monolog": "^1.4.1", + "swiftmailer/swiftmailer": "~5", + "symfony/asset": "~2.8|3.0.*", + "symfony/browser-kit": "~2.8|3.0.*", + "symfony/config": "~2.8|3.0.*", + "symfony/css-selector": "~2.8|3.0.*", + "symfony/debug": "~2.8|3.0.*", + "symfony/doctrine-bridge": "~2.8|3.0.*", + "symfony/dom-crawler": "~2.8|3.0.*", + "symfony/expression-language": "~2.8|3.0.*", + "symfony/finder": "~2.8|3.0.*", + "symfony/form": "~2.8|3.0.*", + "symfony/locale": "~2.8|3.0.*", + "symfony/monolog-bridge": "~2.8|3.0.*", + "symfony/options-resolver": "~2.8|3.0.*", + "symfony/process": "~2.8|3.0.*", + "symfony/security": "~2.8|3.0.*", + "symfony/serializer": "~2.8|3.0.*", + "symfony/translation": "~2.8|3.0.*", + "symfony/twig-bridge": "~2.8|3.0.*", + "symfony/validator": "~2.8|3.0.*", + "symfony/var-dumper": "~2.8|3.0.*", + "twig/twig": "~1.8|~2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-0": { - "Silex": "src/" + "psr-4": { + "Silex\\": "src/Silex" } }, "notification-url": "https://packagist.org/downloads/", @@ -484,114 +578,120 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Igor Wiedler", - "email": "igor@wiedler.ch", - "homepage": "http://wiedler.ch/igor/" + "email": "igor@wiedler.ch" } ], - "description": "The PHP micro-framework based on the Symfony2 Components", + "description": "The PHP micro-framework based on the Symfony Components", "homepage": "http://silex.sensiolabs.org", "keywords": [ "microframework" ], - "time": "2014-06-06 05:48:07" + "time": "2016-05-18T07:56:56+00:00" }, { "name": "symfony/debug", - "version": "v2.5.6", - "target-dir": "Symfony/Component/Debug", + "version": "v3.2.8", "source": { "type": "git", - "url": "https://github.com/symfony/Debug.git", - "reference": "2538d5099b9728b6ca09b261566a766f4f847459" + "url": "https://github.com/symfony/debug.git", + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/2538d5099b9728b6ca09b261566a766f4f847459", - "reference": "2538d5099b9728b6ca09b261566a766f4f847459", + "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686", + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5.9", + "psr/log": "~1.0" }, - "require-dev": { - "symfony/http-foundation": "~2.1", - "symfony/http-kernel": "~2.1" + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, - "suggest": { - "symfony/http-foundation": "", - "symfony/http-kernel": "" + "require-dev": { + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "3.2-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Debug\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Debug Component", - "homepage": "http://symfony.com", - "time": "2014-10-24 05:49:22" + "homepage": "https://symfony.com", + "time": "2017-04-19T20:17:50+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.1.2", - "target-dir": "Symfony/Component/EventDispatcher", + "version": "v3.0.9", "source": { "type": "git", - "url": "https://github.com/symfony/EventDispatcher", - "reference": "v2.1.2" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.2", - "reference": "v2.1.2", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5.9" }, "require-dev": { - "symfony/dependency-injection": "2.1.*" + "psr/log": "~1.0", + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" }, "suggest": { - "symfony/dependency-injection": "2.1.*", - "symfony/http-kernel": "2.1.*" + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "3.0-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\EventDispatcher": "" - } + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -602,43 +702,46 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com", - "time": "2012-09-10 03:53:42" + "homepage": "https://symfony.com", + "time": "2016-07-19T10:44:15+00:00" }, { "name": "symfony/http-foundation", - "version": "v2.3.21", - "target-dir": "Symfony/Component/HttpFoundation", + "version": "v3.0.9", "source": { "type": "git", - "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "30c90f08f948dd43e7310beae7a85c02ad2b655d" + "url": "https://github.com/symfony/http-foundation.git", + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/30c90f08f948dd43e7310beae7a85c02ad2b655d", - "reference": "30c90f08f948dd43e7310beae7a85c02ad2b655d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82", + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.1" + }, + "require-dev": { + "symfony/expression-language": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, - "classmap": [ - "Symfony/Component/HttpFoundation/Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -646,52 +749,59 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony HttpFoundation Component", - "homepage": "http://symfony.com", - "time": "2014-10-23 13:11:04" + "homepage": "https://symfony.com", + "time": "2016-07-17T13:54:30+00:00" }, { "name": "symfony/http-kernel", - "version": "v2.3.21", - "target-dir": "Symfony/Component/HttpKernel", + "version": "v3.0.9", "source": { "type": "git", - "url": "https://github.com/symfony/HttpKernel.git", - "reference": "0154ff659004d4148e8da0f2bdb672efe55e6ee5" + "url": "https://github.com/symfony/http-kernel.git", + "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0154ff659004d4148e8da0f2bdb672efe55e6ee5", - "reference": "0154ff659004d4148e8da0f2bdb672efe55e6ee5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d97ba4425e36e79c794e7d14ff36f00f081b37b3", + "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.5.9", "psr/log": "~1.0", - "symfony/debug": "~2.3", - "symfony/event-dispatcher": "~2.1", - "symfony/http-foundation": "~2.2" + "symfony/debug": "~2.8|~3.0", + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2" + }, + "conflict": { + "symfony/config": "<2.8" }, "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" + "symfony/browser-kit": "~2.8|~3.0", + "symfony/class-loader": "~2.8|~3.0", + "symfony/config": "~2.8|~3.0", + "symfony/console": "~2.8|~3.0", + "symfony/css-selector": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dom-crawler": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0", + "symfony/routing": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0", + "symfony/templating": "~2.8|~3.0", + "symfony/translation": "~2.8|~3.0", + "symfony/var-dumper": "~2.8|~3.0" }, "suggest": { "symfony/browser-kit": "", @@ -699,104 +809,182 @@ "symfony/config": "", "symfony/console": "", "symfony/dependency-injection": "", - "symfony/finder": "" + "symfony/finder": "", + "symfony/var-dumper": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\HttpKernel\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony HttpKernel Component", - "homepage": "http://symfony.com", - "time": "2014-10-24 05:54:08" + "homepage": "https://symfony.com", + "time": "2016-07-30T09:10:37+00:00" }, { - "name": "symfony/routing", - "version": "v2.3.21", - "target-dir": "Symfony/Component/Routing", + "name": "symfony/polyfill-mbstring", + "version": "v1.3.0", "source": { "type": "git", - "url": "https://github.com/symfony/Routing.git", - "reference": "f7f8ebf9c99e5ebfdb908c3558a818c2883eab1f" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/f7f8ebf9c99e5ebfdb908c3558a818c2883eab1f", - "reference": "f7f8ebf9c99e5ebfdb908c3558a818c2883eab1f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-11-14T01:06:16+00:00" + }, + { + "name": "symfony/routing", + "version": "v3.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/routing.git", + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b", + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "conflict": { + "symfony/config": "<2.8" + }, "require-dev": { + "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.2", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0" + "symfony/config": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/http-foundation": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" }, "suggest": { - "doctrine/common": "", - "symfony/config": "", - "symfony/yaml": "" + "doctrine/annotations": "For using the annotation loader", + "symfony/config": "For using the all-in-one router or any loader", + "symfony/dependency-injection": "For loading routes from a service", + "symfony/expression-language": "For using expression matching", + "symfony/http-foundation": "For using a Symfony Request object", + "symfony/yaml": "For using the YAML loader" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Routing\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Routing Component", - "homepage": "http://symfony.com", - "time": "2014-10-13 12:38:27" + "homepage": "https://symfony.com", + "keywords": [ + "router", + "routing", + "uri", + "url" + ], + "time": "2016-06-29T05:40:00+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "silex/silex": 20 - }, + "stability-flags": [], "prefer-stable": false, + "prefer-lowest": false, "platform": { "php": ">=5.3.3" }, diff --git a/src/React/Espresso/ControllerCollection.php b/src/React/Espresso/ControllerCollection.php index e50faf6..9873e90 100644 --- a/src/React/Espresso/ControllerCollection.php +++ b/src/React/Espresso/ControllerCollection.php @@ -8,7 +8,7 @@ class ControllerCollection extends BaseControllerCollection { - public function match($pattern, $to) + public function match($pattern, $to = NULL) { $wrapped = $this->wrapController($to); diff --git a/src/React/Espresso/Stack.php b/src/React/Espresso/Stack.php index 93ac52d..7f2e113 100644 --- a/src/React/Espresso/Stack.php +++ b/src/React/Espresso/Stack.php @@ -5,22 +5,23 @@ use React\EventLoop\Factory; use React\Socket\Server as SocketServer; use React\Http\Server as HttpServer; +use Pimple\Container; -class Stack extends \Pimple +class Stack extends Container { public function __construct($app) { - $this['loop'] = $this->share(function () { + $this['loop'] = function () { return Factory::create(); - }); + }; - $this['socket'] = $this->share(function ($stack) { + $this['socket'] = function ($stack) { return new SocketServer($stack['loop']); - }); + }; - $this['http'] = $this->share(function ($stack) { + $this['http'] = function ($stack) { return new HttpServer($stack['socket']); - }); + }; $isFactory = is_object($app) && method_exists($app, '__invoke'); $this['app'] = $isFactory ? $this->protectService($app) : $app; From b663f7c63a509a7cd0d8f1be387987b663e3c7a1 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:01:23 +0000 Subject: [PATCH 02/22] Application Tests --- composer.json | 3 +- composer.lock | 115 +++++++++++++++++- .../React/Tests/Espresso/ApplicationTest.php | 39 +++--- 3 files changed, 135 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index d95594c..de2ae63 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,8 @@ "php": ">=5.3.3", "react/http": "0.2.*", "silex/silex": "2.0", - "pimple/pimple": "^3.0" + "pimple/pimple": "^3.0", + "symfony/browser-kit": "^3.2" }, "autoload": { "psr-0": { "React\\Espresso": "src" } diff --git a/composer.lock b/composer.lock index 5d9ef82..8f9834f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c61b2bc342e37ec8cee969d49418a7df", + "content-hash": "a4dbb8e56fd814c36e2c849cbc347c20", "packages": [ { "name": "evenement/evenement", @@ -592,6 +592,63 @@ ], "time": "2016-05-18T07:56:56+00:00" }, + { + "name": "symfony/browser-kit", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9fab1ab6f77b77f3df5fc5250fc6956811699b57", + "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/dom-crawler": "~2.8|~3.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" + }, + "suggest": { + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "https://symfony.com", + "time": "2017-04-12T14:13:17+00:00" + }, { "name": "symfony/debug", "version": "v3.2.8", @@ -649,6 +706,62 @@ "homepage": "https://symfony.com", "time": "2017-04-19T20:17:50+00:00" }, + { + "name": "symfony/dom-crawler", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f1ad34e8af09ed17570e027cf0c58a12eddec286", + "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "https://symfony.com", + "time": "2017-04-12T14:13:17+00:00" + }, { "name": "symfony/event-dispatcher", "version": "v3.0.9", diff --git a/tests/React/Tests/Espresso/ApplicationTest.php b/tests/React/Tests/Espresso/ApplicationTest.php index 4cb4286..af8a989 100644 --- a/tests/React/Tests/Espresso/ApplicationTest.php +++ b/tests/React/Tests/Espresso/ApplicationTest.php @@ -6,31 +6,30 @@ use React\Espresso\Stack; use React\Http\Request; use React\Http\Response; +use Silex\WebTestCase; class ApplicationTest extends \PHPUnit_Framework_TestCase { - public function testApplicationWithGetRequest() + public function testApplicationWithHTTPMethods() { $app = new Application(); - $app->get('/', function ($request, $response) { - $response->writeHead(200, array('Content-Type' => 'text/plain')); - $response->end("Hello World\n"); - }); - - $conn = $this->getMock('React\Socket\ConnectionInterface'); - $conn - ->expects($this->at(0)) - ->method('write') - ->with($this->stringContains("text/plain")); - $conn - ->expects($this->at(1)) - ->method('write') - ->with($this->stringContains("Hello World\n")); - - $request = new Request('GET', '/'); - $response = new Response($conn); - - $app($request, $response); + $returnValue = $app->match('/foo', function () {}); + $this->assertInstanceOf('Silex\Controller', $returnValue); + + $returnValue = $app->get('/foo', function () {}); + $this->assertInstanceOf('Silex\Controller', $returnValue); + + $returnValue = $app->post('/foo', function () {}); + $this->assertInstanceOf('Silex\Controller', $returnValue); + + $returnValue = $app->put('/foo', function () {}); + $this->assertInstanceOf('Silex\Controller', $returnValue); + + $returnValue = $app->patch('/foo', function () {}); + $this->assertInstanceOf('Silex\Controller', $returnValue); + + $returnValue = $app->delete('/foo', function () {}); + $this->assertInstanceOf('Silex\Controller', $returnValue); } } From bcc8231fdc2871224949d70c737af9daa00fe752 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:02:35 +0000 Subject: [PATCH 03/22] Application Tests - Remove Webtestcase --- tests/React/Tests/Espresso/ApplicationTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/React/Tests/Espresso/ApplicationTest.php b/tests/React/Tests/Espresso/ApplicationTest.php index af8a989..9fa127d 100644 --- a/tests/React/Tests/Espresso/ApplicationTest.php +++ b/tests/React/Tests/Espresso/ApplicationTest.php @@ -6,7 +6,6 @@ use React\Espresso\Stack; use React\Http\Request; use React\Http\Response; -use Silex\WebTestCase; class ApplicationTest extends \PHPUnit_Framework_TestCase { From 628f969fe606c58095004c3b51346085ababf061 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:06:18 +0000 Subject: [PATCH 04/22] Minimium version for PHP --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index de2ae63..214dd21 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "keywords": ["microframework"], "license": "MIT", "require": { - "php": ">=5.3.3", + "php": ">=5.5", "react/http": "0.2.*", "silex/silex": "2.0", "pimple/pimple": "^3.0", From 39fa8eb1f270788d829bd7199cdb1cd5d1e3c1c8 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:18:23 +0000 Subject: [PATCH 05/22] Travis PHP Versions --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff58203..76f2ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ language: php php: - - 5.3.3 - - 5.3 - - 5.4 - 5.5 - 5.6 + - 7.0 + - 7.1 - hhvm before_script: From 1ade003ee5edfd916145bb6559032130bc55fb39 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:30:17 +0000 Subject: [PATCH 06/22] Travis Test Script --- .travis.yml | 2 +- composer.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 76f2ceb..9f0ef1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ before_script: - composer self-update - composer install -script: phpunit --coverage-text +script: composer test diff --git a/composer.json b/composer.json index 214dd21..27fac47 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,10 @@ "pimple/pimple": "^3.0", "symfony/browser-kit": "^3.2" }, + "require-dev": { + "phpunit/phpunit": "5.4.6", + "symfony/browser-kit": "^3.2" + }, "autoload": { "psr-0": { "React\\Espresso": "src" } }, @@ -17,5 +21,8 @@ "branch-alias": { "dev-master": "0.2-dev" } + }, + "scripts": { + "test": "php vendor/bin/phpunit --coverage-text" } } From faa147d8ecd116138c616c7601410841d56637f8 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:38:50 +0000 Subject: [PATCH 07/22] Travis Test Script --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f0ef1e..7a69b50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,11 @@ php: - 7.1 - hhvm + before_script: - composer self-update - - composer install + - composer update + - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then composer require --dev --no-update phpunit/phpunit ~4; fi + - if [[ ${TRAVIS_PHP_VERSION:0:3} => "7.0" ]]; then composer require --dev --no-update phpunit/phpunit 5.4.6; fi script: composer test From ef706c35cad47a6477f96949380211d82ff2194a Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:41:59 +0000 Subject: [PATCH 08/22] Travis Test Script --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7a69b50..5e6a362 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_script: - composer self-update - composer update - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then composer require --dev --no-update phpunit/phpunit ~4; fi + - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then composer require --dev --no-update phpunit/phpunit ~4; fi - if [[ ${TRAVIS_PHP_VERSION:0:3} => "7.0" ]]; then composer require --dev --no-update phpunit/phpunit 5.4.6; fi script: composer test From d1459811010281f9a054c05a37f3481dad32366d Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:43:41 +0000 Subject: [PATCH 09/22] Travis Test Script --- .travis.yml | 6 +----- tests/React/Tests/Espresso/ApplicationTest.php | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e6a362..e6f6b6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,8 @@ php: - 7.1 - hhvm - before_script: - composer self-update - composer update - - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then composer require --dev --no-update phpunit/phpunit ~4; fi - - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then composer require --dev --no-update phpunit/phpunit ~4; fi - - if [[ ${TRAVIS_PHP_VERSION:0:3} => "7.0" ]]; then composer require --dev --no-update phpunit/phpunit 5.4.6; fi -script: composer test +script: phpunit --coverage-text diff --git a/tests/React/Tests/Espresso/ApplicationTest.php b/tests/React/Tests/Espresso/ApplicationTest.php index 9fa127d..ca927b6 100644 --- a/tests/React/Tests/Espresso/ApplicationTest.php +++ b/tests/React/Tests/Espresso/ApplicationTest.php @@ -7,7 +7,7 @@ use React\Http\Request; use React\Http\Response; -class ApplicationTest extends \PHPUnit_Framework_TestCase +class ApplicationTest extends PHPUnit_Framework_TestCase { public function testApplicationWithHTTPMethods() { From add556c377896c54b81cba803598fb3de02c17ff Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:47:20 +0000 Subject: [PATCH 10/22] Remove PHPUnit --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 27fac47..fcea56f 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "symfony/browser-kit": "^3.2" }, "require-dev": { - "phpunit/phpunit": "5.4.6", "symfony/browser-kit": "^3.2" }, "autoload": { From 20b531c846617e4f99c8ea7d21dc27d2bcebba7b Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 14:57:30 +0000 Subject: [PATCH 11/22] Remove PHPUnit --- composer.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/composer.json b/composer.json index fcea56f..e56f444 100644 --- a/composer.json +++ b/composer.json @@ -7,11 +7,7 @@ "php": ">=5.5", "react/http": "0.2.*", "silex/silex": "2.0", - "pimple/pimple": "^3.0", - "symfony/browser-kit": "^3.2" - }, - "require-dev": { - "symfony/browser-kit": "^3.2" + "pimple/pimple": "^3.0" }, "autoload": { "psr-0": { "React\\Espresso": "src" } @@ -20,8 +16,5 @@ "branch-alias": { "dev-master": "0.2-dev" } - }, - "scripts": { - "test": "php vendor/bin/phpunit --coverage-text" } } From 1b3725f6d1380c1860f0925d5d0fedf1691feb6b Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 15:04:31 +0000 Subject: [PATCH 12/22] Remove PHPUnit --- tests/React/Tests/Espresso/ApplicationTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/React/Tests/Espresso/ApplicationTest.php b/tests/React/Tests/Espresso/ApplicationTest.php index ca927b6..9fa127d 100644 --- a/tests/React/Tests/Espresso/ApplicationTest.php +++ b/tests/React/Tests/Espresso/ApplicationTest.php @@ -7,7 +7,7 @@ use React\Http\Request; use React\Http\Response; -class ApplicationTest extends PHPUnit_Framework_TestCase +class ApplicationTest extends \PHPUnit_Framework_TestCase { public function testApplicationWithHTTPMethods() { From ca48898897efcfbc2b82722cda339cd129721dbf Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 15:12:55 +0000 Subject: [PATCH 13/22] =?UTF-8?q?Vers=C3=B5es=20do=20PHPUnit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e6f6b6d..9d0b60c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,11 @@ php: before_script: - composer self-update - composer update + - if [[ ${TRAVIS_PHP_VERSION:0:3} >= "7.0" ]]; then composer require --dev --no-update phpunit/phpunit 5.7.5; fi -script: phpunit --coverage-text +script: + - 'if [ ${TRAVIS_PHP_VERSION:0:3} >= "7.0" ]; then + php vendor/bin/phpunit --coverage-text + else + phpunit --coverage-text + fi' From abc04e3f7ed18e2b0c76897815bd3b81f6137665 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 15:59:09 +0000 Subject: [PATCH 14/22] =?UTF-8?q?Vers=C3=B5es=20do=20PHPUnit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 9 ++------- composer.json | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d0b60c..56d071b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,6 @@ php: before_script: - composer self-update - composer update - - if [[ ${TRAVIS_PHP_VERSION:0:3} >= "7.0" ]]; then composer require --dev --no-update phpunit/phpunit 5.7.5; fi + - composer require phpunit/phpunit ^4 -script: - - 'if [ ${TRAVIS_PHP_VERSION:0:3} >= "7.0" ]; then - php vendor/bin/phpunit --coverage-text - else - phpunit --coverage-text - fi' +script: php vendor/bin/phpunit --coverage-text diff --git a/composer.json b/composer.json index e56f444..c263352 100644 --- a/composer.json +++ b/composer.json @@ -16,5 +16,8 @@ "branch-alias": { "dev-master": "0.2-dev" } + }, + "require-dev": { + "phpunit/phpunit": "5.7.5" } } From a36b6ccbc7eab10cfc3b187bccd9d9fb3202530a Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 20:02:42 -0300 Subject: [PATCH 15/22] Compose hotfixes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56d071b..3378ca8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ php: before_script: - composer self-update - composer update - - composer require phpunit/phpunit ^4 + - composer require phpunit/phpunit >= 4 script: php vendor/bin/phpunit --coverage-text From ed3f42171ac0c9d9f5e968cb8c7d99fa31f7db0c Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 20:10:59 -0300 Subject: [PATCH 16/22] PHPUnit Hotfix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3378ca8..ca6a48d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ php: before_script: - composer self-update - composer update - - composer require phpunit/phpunit >= 4 + - composer require phpunit/phpunit script: php vendor/bin/phpunit --coverage-text From 1783a4daa09059aeac5d982bdbbd23f897bf8877 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 20:15:50 -0300 Subject: [PATCH 17/22] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca6a48d..4dd2779 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.5 - 5.6 - 7.0 - 7.1 @@ -10,6 +9,6 @@ php: before_script: - composer self-update - composer update - - composer require phpunit/phpunit + - composer require phpunit/phpunit 5.7.5 script: php vendor/bin/phpunit --coverage-text From 43d683b4efb4a6a3304ab1075f5457fe5abafa5e Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Wed, 3 May 2017 20:19:32 -0300 Subject: [PATCH 18/22] Fix PHP Version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c263352..f2b966c 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "keywords": ["microframework"], "license": "MIT", "require": { - "php": ">=5.5", + "php": ">=5.6", "react/http": "0.2.*", "silex/silex": "2.0", "pimple/pimple": "^3.0" From 809f2e2446eb4e0574ad62b18c32b4d8379d1b6e Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Sun, 7 May 2017 02:04:55 -0300 Subject: [PATCH 19/22] Migrate to React/http 0.6 --- composer.json | 2 +- composer.lock | 1948 +++++++++++++++++++++++++++------- src/React/Espresso/Stack.php | 3 +- 3 files changed, 1562 insertions(+), 391 deletions(-) diff --git a/composer.json b/composer.json index f2b966c..a736c25 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "MIT", "require": { "php": ">=5.6", - "react/http": "0.2.*", + "react/http": "0.6", "silex/silex": "2.0", "pimple/pimple": "^3.0" }, diff --git a/composer.lock b/composer.lock index 8f9834f..2dfe94c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,26 +4,31 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a4dbb8e56fd814c36e2c849cbc347c20", + "content-hash": "d2bd8e0b846ecdabfcd6696293c89223", "packages": [ { "name": "evenement/evenement", - "version": "v1.0.0", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/igorw/evenement.git", - "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d" + "reference": "f6e843799fd4f4184d54d8fc7b5b3551c9fa803e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d", - "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d", + "url": "https://api.github.com/repos/igorw/evenement/zipball/f6e843799fd4f4184d54d8fc7b5b3551c9fa803e", + "reference": "f6e843799fd4f4184d54d8fc7b5b3551c9fa803e", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { "psr-0": { "Evenement": "src" @@ -40,88 +45,85 @@ "homepage": "http://wiedler.ch/igor/" } ], - "description": "Événement is a very simple event dispatching library for PHP 5.3", + "description": "Événement is a very simple event dispatching library for PHP", "keywords": [ - "event-dispatcher" + "event-dispatcher", + "event-emitter" ], - "time": "2012-05-30T15:01:08+00:00" + "time": "2012-11-02T14:49:47+00:00" }, { - "name": "guzzle/common", - "version": "v3.0.7", - "target-dir": "Guzzle/Common", + "name": "pimple/pimple", + "version": "v3.0.2", "source": { "type": "git", - "url": "https://github.com/Guzzle3/common.git", - "reference": "b7c6ec11fb5f141c31fea22844aac2343db853f4" + "url": "https://github.com/silexphp/Pimple.git", + "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/common/zipball/b7c6ec11fb5f141c31fea22844aac2343db853f4", - "reference": "b7c6ec11fb5f141c31fea22844aac2343db853f4", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a30f7d6e57565a2e1a316e1baf2a483f788b258a", + "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a", "shasum": "" }, "require": { - "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.1" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { "psr-0": { - "Guzzle\\Common": "" + "Pimple": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Common libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Pimple, a simple Dependency Injection Container", + "homepage": "http://pimple.sensiolabs.org", "keywords": [ - "collection", - "common", - "event", - "exception" + "container", + "dependency injection" ], - "abandoned": "guzzle/guzzle", - "time": "2012-12-19T23:06:35+00:00" + "time": "2015-09-11T15:10:35+00:00" }, { - "name": "guzzle/http", - "version": "v3.0.7", - "target-dir": "Guzzle/Http", + "name": "psr/http-message", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/Guzzle3/http.git", - "reference": "eea92ef701a69b48d1e37fc9dd79058d41aeec93" + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/http/zipball/eea92ef701a69b48d1e37fc9dd79058d41aeec93", - "reference": "eea92ef701a69b48d1e37fc9dd79058d41aeec93", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { - "ext-curl": "*", - "guzzle/common": "self.version", - "guzzle/parser": "self.version", - "guzzle/stream": "self.version", - "php": ">=5.3.2" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Guzzle\\Http": "" + "psr-4": { + "Psr\\Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -130,192 +132,184 @@ ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "HTTP libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", "keywords": [ - "Guzzle", - "client", - "curl", "http", - "http client" + "http-message", + "psr", + "psr-7", + "request", + "response" ], - "abandoned": "guzzle/guzzle", - "time": "2012-12-14T00:49:17+00:00" + "time": "2016-08-06T14:39:51+00:00" }, { - "name": "guzzle/parser", - "version": "v3.0.7", - "target-dir": "Guzzle/Parser", + "name": "psr/log", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/Guzzle3/parser.git", - "reference": "8a1f6829d75274de16232cb327597db3067a2074" + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/parser/zipball/8a1f6829d75274de16232cb327597db3067a2074", - "reference": "8a1f6829d75274de16232cb327597db3067a2074", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Guzzle\\Parser": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Interchangeable parsers used by Guzzle", - "homepage": "http://guzzlephp.org/", + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ - "URI Template", - "cookie", - "http", - "message", - "url" + "log", + "psr", + "psr-3" ], - "abandoned": "guzzle/guzzle", - "time": "2012-12-07T16:45:11+00:00" + "time": "2016-10-10T12:19:37+00:00" }, { - "name": "guzzle/stream", - "version": "v3.0.7", - "target-dir": "Guzzle/Stream", + "name": "react/event-loop", + "version": "v0.4.3", "source": { "type": "git", - "url": "https://github.com/Guzzle3/stream.git", - "reference": "c499757c760159188a9573362b8086ef25e6734e" + "url": "https://github.com/reactphp/event-loop.git", + "reference": "8bde03488ee897dc6bb3d91e4e17c353f9c5252f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/stream/zipball/c499757c760159188a9573362b8086ef25e6734e", - "reference": "c499757c760159188a9573362b8086ef25e6734e", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/8bde03488ee897dc6bb3d91e4e17c353f9c5252f", + "reference": "8bde03488ee897dc6bb3d91e4e17c353f9c5252f", "shasum": "" }, "require": { - "guzzle/common": "self.version", - "php": ">=5.3.2" + "php": ">=5.4.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "suggest": { + "ext-event": "~1.0", + "ext-libev": "*", + "ext-libevent": ">=0.1.0" }, + "type": "library", "autoload": { - "psr-0": { - "Guzzle\\Stream": "" + "psr-4": { + "React\\EventLoop\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle stream wrapper component", - "homepage": "http://guzzlephp.org/", + "description": "Event loop abstraction layer that libraries can use for evented I/O.", "keywords": [ - "Guzzle", - "component", - "stream" + "asynchronous", + "event-loop" ], - "abandoned": "guzzle/guzzle", - "time": "2012-12-07T16:45:11+00:00" + "time": "2017-04-27T10:56:23+00:00" }, { - "name": "pimple/pimple", - "version": "v3.0.2", + "name": "react/http", + "version": "v0.6.0", "source": { "type": "git", - "url": "https://github.com/silexphp/Pimple.git", - "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a" + "url": "https://github.com/reactphp/http.git", + "reference": "b5e7d9bfc9effe8ec723af942c66df042ad17fe6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a30f7d6e57565a2e1a316e1baf2a483f788b258a", - "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a", + "url": "https://api.github.com/repos/reactphp/http/zipball/b5e7d9bfc9effe8ec723af942c66df042ad17fe6", + "reference": "b5e7d9bfc9effe8ec723af942c66df042ad17fe6", "shasum": "" }, "require": { - "php": ">=5.3.0" + "evenement/evenement": "^2.0 || ^1.0", + "php": ">=5.3.0", + "react/socket": "^0.5", + "react/stream": "^0.6 || ^0.5 || ^0.4.4", + "ringcentral/psr7": "^1.2" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^4.8.10||^5.0" }, + "type": "library", "autoload": { - "psr-0": { - "Pimple": "src/" + "psr-4": { + "React\\Http\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "description": "Event-driven, streaming plaintext HTTP and secure HTTPS server for ReactPHP", "keywords": [ - "container", - "dependency injection" + "event-driven", + "http", + "https", + "reactphp", + "server", + "streaming" ], - "time": "2015-09-11T15:10:35+00:00" + "time": "2017-03-09T14:03:48+00:00" }, { - "name": "psr/log", - "version": "1.0.2", + "name": "react/promise", + "version": "v2.5.1", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "url": "https://github.com/reactphp/promise.git", + "reference": "62785ae604c8d69725d693eb370e1d67e94c4053" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053", + "reference": "62785ae604c8d69725d693eb370e1d67e94c4053", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "~4.8" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } + "React\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -323,190 +317,167 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "A lightweight implementation of CommonJS Promises/A for PHP", "keywords": [ - "log", - "psr", - "psr-3" + "promise", + "promises" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2017-03-25T12:08:31+00:00" }, { - "name": "react/event-loop", - "version": "v0.2.7", - "target-dir": "React/EventLoop", + "name": "react/socket", + "version": "v0.5.1", "source": { "type": "git", - "url": "https://github.com/reactphp/event-loop.git", - "reference": "134b94dc555d320bd31253a215c8a65ef151a79a" + "url": "https://github.com/reactphp/socket.git", + "reference": "c0e337e375d5fb064da4ba62a91a29815e7502f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/event-loop/zipball/134b94dc555d320bd31253a215c8a65ef151a79a", - "reference": "134b94dc555d320bd31253a215c8a65ef151a79a", + "url": "https://api.github.com/repos/reactphp/socket/zipball/c0e337e375d5fb064da4ba62a91a29815e7502f8", + "reference": "c0e337e375d5fb064da4ba62a91a29815e7502f8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "evenement/evenement": "~2.0|~1.0", + "php": ">=5.3.0", + "react/event-loop": "0.4.*|0.3.*", + "react/promise": "^2.0 || ^1.1", + "react/stream": "^0.6 || ^0.5 || ^0.4.5" }, - "suggest": { - "ext-libev": "*", - "ext-libevent": ">=0.0.5" + "require-dev": { + "clue/block-react": "^1.1", + "phpunit/phpunit": "~4.8", + "react/socket-client": "^0.5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2-dev" - } - }, "autoload": { - "psr-0": { - "React\\EventLoop": "" + "psr-4": { + "React\\Socket\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Event loop abstraction layer that libraries can use for evented I/O.", + "description": "Async, streaming plaintext TCP/IP and secure TLS socket server for React PHP", "keywords": [ - "event-loop" + "Socket" ], - "time": "2013-01-05T11:41:26+00:00" + "time": "2017-03-09T12:13:07+00:00" }, { - "name": "react/http", - "version": "v0.2.6", - "target-dir": "React/Http", + "name": "react/stream", + "version": "v0.6.0", "source": { "type": "git", - "url": "https://github.com/reactphp/http.git", - "reference": "5e920f734f4065de1582c125b4bf35128279972f" + "url": "https://github.com/reactphp/stream.git", + "reference": "b68463756d8be851829b7a9de8200c9d19eb997e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/http/zipball/5e920f734f4065de1582c125b4bf35128279972f", - "reference": "5e920f734f4065de1582c125b4bf35128279972f", + "url": "https://api.github.com/repos/reactphp/stream/zipball/b68463756d8be851829b7a9de8200c9d19eb997e", + "reference": "b68463756d8be851829b7a9de8200c9d19eb997e", "shasum": "" }, "require": { - "guzzle/http": "3.0.*", - "guzzle/parser": "3.0.*", - "php": ">=5.3.3", - "react/socket": "0.2.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2-dev" - } - }, - "autoload": { - "psr-0": { - "React\\Http": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Library for building an evented http server.", - "keywords": [ - "http" - ], - "time": "2012-12-26T16:33:04+00:00" - }, - { - "name": "react/socket", - "version": "v0.2.6", - "target-dir": "React/Socket", - "source": { - "type": "git", - "url": "https://github.com/reactphp/socket.git", - "reference": "21e3fe670b2f18e3c6b2cb73f14e1c58fe7bca84" + "evenement/evenement": "^2.0|^1.0", + "php": ">=5.3.8" }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/21e3fe670b2f18e3c6b2cb73f14e1c58fe7bca84", - "reference": "21e3fe670b2f18e3c6b2cb73f14e1c58fe7bca84", - "shasum": "" + "require-dev": { + "clue/stream-filter": "~1.2", + "phpunit/phpunit": "^5.0 || ^4.8.10", + "react/event-loop": "^0.4|^0.3", + "react/promise": "^2.0|^1.0" }, - "require": { - "evenement/evenement": "1.0.*", - "php": ">=5.3.3", - "react/event-loop": "0.2.*", - "react/stream": "0.2.*" + "suggest": { + "react/event-loop": "^0.4", + "react/promise": "^2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2-dev" - } - }, "autoload": { - "psr-0": { - "React\\Socket": "" + "psr-4": { + "React\\Stream\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Library for building an evented socket server.", + "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP", "keywords": [ - "Socket" + "event-driven", + "io", + "non-blocking", + "pipe", + "reactphp", + "readable", + "stream", + "writable" ], - "time": "2012-12-14T00:58:14+00:00" + "time": "2017-03-26T18:02:15+00:00" }, { - "name": "react/stream", - "version": "v0.2.6", - "target-dir": "React/Stream", + "name": "ringcentral/psr7", + "version": "1.2.1", "source": { "type": "git", - "url": "https://github.com/reactphp/stream.git", - "reference": "34c1059cffb44873440135e9a86fe9ae9caf5acd" + "url": "https://github.com/ringcentral/psr7.git", + "reference": "2594fb47cdc659f3fcf0aa1559b7355460555303" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/stream/zipball/34c1059cffb44873440135e9a86fe9ae9caf5acd", - "reference": "34c1059cffb44873440135e9a86fe9ae9caf5acd", + "url": "https://api.github.com/repos/ringcentral/psr7/zipball/2594fb47cdc659f3fcf0aa1559b7355460555303", + "reference": "2594fb47cdc659f3fcf0aa1559b7355460555303", "shasum": "" }, "require": { - "evenement/evenement": "1.0.*", - "php": ">=5.3.3" + "php": ">=5.3", + "psr/http-message": "~1.0" }, - "suggest": { - "react/event-loop": "0.2.*", - "react/promise": "1.0.*" + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "1.0-dev" } }, "autoload": { - "psr-0": { - "React\\Stream": "" - } + "psr-4": { + "RingCentral\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Basic readable and writable stream interfaces that support piping.", + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", "keywords": [ - "pipe", - "stream" + "http", + "message", + "stream", + "uri" ], - "time": "2012-12-14T00:58:14+00:00" + "time": "2016-03-25T17:36:49+00:00" }, { "name": "silex/silex", @@ -593,29 +564,29 @@ "time": "2016-05-18T07:56:56+00:00" }, { - "name": "symfony/browser-kit", + "name": "symfony/debug", "version": "v3.2.8", "source": { "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57" + "url": "https://github.com/symfony/debug.git", + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9fab1ab6f77b77f3df5fc5250fc6956811699b57", - "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57", + "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686", + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686", "shasum": "" }, "require": { "php": ">=5.5.9", - "symfony/dom-crawler": "~2.8|~3.0" + "psr/log": "~1.0" }, - "require-dev": { - "symfony/css-selector": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, - "suggest": { - "symfony/process": "" + "require-dev": { + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { @@ -625,7 +596,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Component\\BrowserKit\\": "" + "Symfony\\Component\\Debug\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -645,135 +616,22 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony BrowserKit Component", + "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-19T20:17:50+00:00" }, { - "name": "symfony/debug", - "version": "v3.2.8", + "name": "symfony/event-dispatcher", + "version": "v3.0.9", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686", - "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2017-04-19T20:17:50+00:00" - }, - { - "name": "symfony/dom-crawler", - "version": "v3.2.8", - "source": { - "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f1ad34e8af09ed17570e027cf0c58a12eddec286", - "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.0" - }, - "require-dev": { - "symfony/css-selector": "~2.8|~3.0" - }, - "suggest": { - "symfony/css-selector": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" - }, - { - "name": "symfony/event-dispatcher", - "version": "v3.0.9", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", - "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", + "reference": "54da3ff63dec3c9c0e32ec3f95a7d94ef64baa00", "shasum": "" }, "require": { @@ -1092,14 +950,1328 @@ "time": "2016-06-29T05:40:00+00:00" } ], - "packages-dev": [], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14T21:17:01+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.6.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-04-12T18:52:22+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2015-12-27T11:43:31+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2016-09-30T07:12:33+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.2.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2016-11-25T06:54:22+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8 || ^5.6.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2017-03-02T20:05:34+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^1.3.2 || ^2.0", + "sebastian/version": "^1.0 || ^2.0" + }, + "require-dev": { + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" + }, + "suggest": { + "ext-xdebug": "^2.5.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2017-04-02T07:44:40+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2016-10-03T07:40:28+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26T11:10:40+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.11", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2017-02-27T10:12:30+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "5.7.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "50fd2be8f3e23e91da825f36f08e5f9633076ffe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50fd2be8f3e23e91da825f36f08e5f9633076ffe", + "reference": "50fd2be8f3e23e91da825f36f08e5f9633076ffe", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.6.2", + "phpunit/php-code-coverage": "^4.0.3", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "~1.2.2", + "sebastian/diff": "~1.2", + "sebastian/environment": "^1.3.4 || ^2.0", + "sebastian/exporter": "~2.0", + "sebastian/global-state": "^1.0 || ^2.0", + "sebastian/object-enumerator": "~2.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0|~2.0", + "symfony/yaml": "~2.1|~3.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-xdebug": "*", + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2016-12-28T07:18:51+00:00" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "3.4.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2 || ^2.0" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.4" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2016-12-08T20:27:08+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" + }, + { + "name": "sebastian/comparator", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2 || ~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2017-01-29T09:50:25+00:00" + }, + { + "name": "sebastian/diff", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2015-12-08T07:14:41+00:00" + }, + { + "name": "sebastian/environment", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2016-11-26T07:53:53+00:00" + }, + { + "name": "sebastian/exporter", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2016-11-19T08:54:04+00:00" + }, + { + "name": "sebastian/global-state", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2017-04-27T15:39:26+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-02-18T15:18:39+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2016-11-19T07:33:16+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28T20:34:47+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "symfony/yaml", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6", + "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2017-05-01T14:55:58+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2016-11-23T20:04:58+00:00" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.3" + "php": ">=5.6" }, "platform-dev": [] } diff --git a/src/React/Espresso/Stack.php b/src/React/Espresso/Stack.php index 7f2e113..2aa8430 100644 --- a/src/React/Espresso/Stack.php +++ b/src/React/Espresso/Stack.php @@ -16,7 +16,7 @@ public function __construct($app) }; $this['socket'] = function ($stack) { - return new SocketServer($stack['loop']); + return new SocketServer(1337, $stack['loop']); }; $this['http'] = function ($stack) { @@ -30,7 +30,6 @@ public function __construct($app) public function listen($port, $host = '127.0.0.1') { $this['http']->on('request', $this['app']); - $this['socket']->listen($port, $host); $this['loop']->run(); } From 22136ab05744b60b71bcacd3cae737d5e2367dc2 Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Sun, 7 May 2017 02:10:20 -0300 Subject: [PATCH 20/22] Comments --- src/React/Espresso/Stack.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/React/Espresso/Stack.php b/src/React/Espresso/Stack.php index 2aa8430..baac4e5 100644 --- a/src/React/Espresso/Stack.php +++ b/src/React/Espresso/Stack.php @@ -7,8 +7,15 @@ use React\Http\Server as HttpServer; use Pimple\Container; +/** + * Stack Server + */ class Stack extends Container { + /** + * Construct Function + * @param ControllerCollection $app + */ public function __construct($app) { $this['loop'] = function () { @@ -27,13 +34,24 @@ public function __construct($app) $this['app'] = $isFactory ? $this->protectService($app) : $app; } + /** + * Listem Class + * @param [type] $port + * @param string $host + * @return void + */ public function listen($port, $host = '127.0.0.1') { $this['http']->on('request', $this['app']); $this['loop']->run(); } - - // Pimple::protect minus the type hint + + /** + * Undocumented function + * + * @param [type] $callable + * @return void + */ public function protectService($callable) { return function ($c) use ($callable) { From a65175afe51530c47ea894edbb58a654f287a87f Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Sun, 7 May 2017 02:18:54 -0300 Subject: [PATCH 21/22] Removing HHVM --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4dd2779..b2d50cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ php: - 5.6 - 7.0 - 7.1 - - hhvm before_script: - composer self-update From c8fb59b85b52f2157ca21f5f4e9f795e543b8b8f Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Sun, 7 May 2017 04:34:00 -0300 Subject: [PATCH 22/22] Controller Colletion --- src/React/Espresso/ControllerCollection.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/React/Espresso/ControllerCollection.php b/src/React/Espresso/ControllerCollection.php index 9873e90..cb7e89c 100644 --- a/src/React/Espresso/ControllerCollection.php +++ b/src/React/Espresso/ControllerCollection.php @@ -6,6 +6,9 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\StreamedResponse as SymfonyStreamedResponse; +/** + * ControllerCollection + */ class ControllerCollection extends BaseControllerCollection { public function match($pattern, $to = NULL)