From 8851a6d68bc7f0a8c3094c3c15a8f8f0adf5bd80 Mon Sep 17 00:00:00 2001 From: Lang Date: Tue, 31 Jan 2017 10:39:04 +0100 Subject: [PATCH] composer update && rewrite user authentication page names --- README.md | 9 +- composer.json | 3 +- composer.lock | 716 ++++++++++-------- .../views/Registration/register.html.twig | 4 +- .../Resources/views/Security/login.html.twig | 4 +- .../Resources/public/css/style.homepage.css | 8 +- .../Resources/views/Game/index.html.twig | 4 +- var/SymfonyRequirements.php | 6 +- web/config.php | 2 +- 9 files changed, 449 insertions(+), 307 deletions(-) diff --git a/README.md b/README.md index 48344b9..128676b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This is a Symfony 3 project w/ React JS in standalone mode and w/ WebSocket. 1.) Backend WebSocket server start as daemon - GeniusesOfSymfony/WebSocketBundle - $ nohup bin/console gos:websocket:server & + $ nohup php bin/console gos:websocket:server --env=prod & 2.) React JS WebPack watch generator w/ babel presets: es2015, react @@ -32,4 +32,9 @@ This is a Symfony 3 project w/ React JS in standalone mode and w/ WebSocket. 3.) Connect to Prod - ssh xxsvci@laszlolang.com -i ~/.ssh/id_rsa_laszlolang + $ ssh xxsvci@laszlolang.com -i ~/.ssh/id_rsa_laszlolang + + 4.) Stunnel config + + $ sudo nano /etc/stunnel/stunnel.conf + diff --git a/composer.json b/composer.json index ea74dd9..ba4b902 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,8 @@ "predis/predis": "^1.0", "snc/redis-bundle": "^2.0", "hwi/oauth-bundle": "^0.5.1", - "cleentfaar/slack-bundle": "^0.20.1" + "cleentfaar/slack-bundle": "^0.20.1", + "symfony/translation": "^3.2" }, "require-dev": { "sensio/generator-bundle": "^3.0", diff --git a/composer.lock b/composer.lock index 1bf05b6..3e9ba8b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "8325ddf53babcbda387208723c05a0f0", - "content-hash": "d9f2a2a5e6279269f9f7c2cc1fe0573a", + "hash": "faf27ce22c5a73a65c1254d92f336827", + "content-hash": "77145d27a5ac3cb7d7a5c58ec2cd481b", "packages": [ { "name": "cleentfaar/slack", @@ -122,35 +122,35 @@ }, { "name": "doctrine/annotations", - "version": "v1.2.7", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" + "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/bd4461328621bde0ae6b1b2675fbc6aca4ceb558", + "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": ">=5.3.2" + "php": "^5.6 || ^7.0" }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "^5.6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Annotations\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,20 +186,20 @@ "docblock", "parser" ], - "time": "2015-08-31 12:32:49" + "time": "2016-12-30 15:59:45" }, { "name": "doctrine/cache", - "version": "v1.6.0", + "version": "v1.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" + "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", - "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", + "url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3", + "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3", "shasum": "" }, "require": { @@ -256,32 +256,33 @@ "cache", "caching" ], - "time": "2015-12-31 16:37:02" + "time": "2016-10-29 11:16:17" }, { "name": "doctrine/collections", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" + "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", - "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba", + "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "doctrine/coding-standard": "~0.1@dev", + "phpunit/phpunit": "^5.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -322,20 +323,20 @@ "collections", "iterator" ], - "time": "2015-04-14 22:21:58" + "time": "2017-01-03 10:49:41" }, { "name": "doctrine/common", - "version": "v2.6.1", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "a579557bc689580c19fee4e27487a67fe60defc0" + "reference": "930297026c8009a567ac051fd545bf6124150347" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0", - "reference": "a579557bc689580c19fee4e27487a67fe60defc0", + "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347", + "reference": "930297026c8009a567ac051fd545bf6124150347", "shasum": "" }, "require": { @@ -344,10 +345,10 @@ "doctrine/collections": "1.*", "doctrine/inflector": "1.*", "doctrine/lexer": "1.*", - "php": "~5.5|~7.0" + "php": "~5.6|~7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0" + "phpunit/phpunit": "^5.4.6" }, "type": "library", "extra": { @@ -395,24 +396,24 @@ "persistence", "spl" ], - "time": "2015-12-25 13:18:31" + "time": "2017-01-13 14:02:13" }, { "name": "doctrine/dbal", - "version": "v2.5.5", + "version": "v2.5.10", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9" + "reference": "fc376f7a61498e18520cd6fa083752a4ca08072b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9", - "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/fc376f7a61498e18520cd6fa083752a4ca08072b", + "reference": "fc376f7a61498e18520cd6fa083752a4ca08072b", "shasum": "" }, "require": { - "doctrine/common": ">=2.4,<2.7-dev", + "doctrine/common": ">=2.4,<2.8-dev", "php": ">=5.3.2" }, "require-dev": { @@ -466,41 +467,41 @@ "persistence", "queryobject" ], - "time": "2016-09-09 19:13:33" + "time": "2017-01-23 23:17:10" }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.4", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7" + "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/dd40b0a7fb16658cda9def9786992b8df8a49be7", - "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a01d99bc6c9a6c8a8ace0012690099dd957ce9b9", + "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9", "shasum": "" }, "require": { "doctrine/dbal": "~2.3", "doctrine/doctrine-cache-bundle": "~1.0", "jdorn/sql-formatter": "~1.1", - "php": ">=5.3.2", - "symfony/console": "~2.3|~3.0", - "symfony/dependency-injection": "~2.3|~3.0", - "symfony/doctrine-bridge": "~2.2|~3.0", - "symfony/framework-bundle": "~2.3|~3.0" + "php": ">=5.5.9", + "symfony/console": "~2.7|~3.0", + "symfony/dependency-injection": "~2.7|~3.0", + "symfony/doctrine-bridge": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0" }, "require-dev": { "doctrine/orm": "~2.3", "phpunit/phpunit": "~4", - "satooshi/php-coveralls": "~0.6.1", + "satooshi/php-coveralls": "^1.0", "symfony/phpunit-bridge": "~2.7|~3.0", "symfony/property-info": "~2.8|~3.0", - "symfony/validator": "~2.2|~3.0", - "symfony/yaml": "~2.2|~3.0", - "twig/twig": "~1.10" + "symfony/validator": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0", + "twig/twig": "~1.10|~2.0" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -547,7 +548,7 @@ "orm", "persistence" ], - "time": "2016-08-10 15:35:22" + "time": "2017-01-16 12:01:26" }, { "name": "doctrine/doctrine-cache-bundle", @@ -639,16 +640,16 @@ }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "0b89ee55bceb53c60bc4ba32924ac5053e377abb" + "reference": "6276139e0b913a4e5120fc36bb5b0eae8ac549bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/0b89ee55bceb53c60bc4ba32924ac5053e377abb", - "reference": "0b89ee55bceb53c60bc4ba32924ac5053e377abb", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/6276139e0b913a4e5120fc36bb5b0eae8ac549bc", + "reference": "6276139e0b913a4e5120fc36bb5b0eae8ac549bc", "shasum": "" }, "require": { @@ -663,7 +664,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -696,7 +697,7 @@ "migrations", "schema" ], - "time": "2016-06-30 19:26:35" + "time": "2016-12-05 18:36:37" }, { "name": "doctrine/inflector", @@ -875,16 +876,16 @@ }, { "name": "doctrine/migrations", - "version": "1.4.1", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "0d0ff5da10c5d30846da32060bd9e357abf70a05" + "reference": "c81147c0f2938a6566594455367e095150547f72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/0d0ff5da10c5d30846da32060bd9e357abf70a05", - "reference": "0d0ff5da10c5d30846da32060bd9e357abf70a05", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/c81147c0f2938a6566594455367e095150547f72", + "reference": "c81147c0f2938a6566594455367e095150547f72", "shasum": "" }, "require": { @@ -899,9 +900,10 @@ "doctrine/orm": "2.*", "jdorn/sql-formatter": "~1.1", "johnkary/phpunit-speedtrap": "~1.0@dev", + "mikey179/vfsstream": "^1.6", "mockery/mockery": "^0.9.4", "phpunit/phpunit": "~4.7", - "satooshi/php-coveralls": "0.6.*" + "satooshi/php-coveralls": "^1.0" }, "suggest": { "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command." @@ -912,7 +914,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "v1.5.x-dev" + "dev-master": "v1.6.x-dev" } }, "autoload": { @@ -944,26 +946,26 @@ "database", "migrations" ], - "time": "2016-03-14 12:29:11" + "time": "2016-12-25 22:54:00" }, { "name": "doctrine/orm", - "version": "v2.5.5", + "version": "v2.5.6", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45" + "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/73e4be7c7b3ba26f96b781a40b33feba4dfa6d45", - "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b", + "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b", "shasum": "" }, "require": { "doctrine/cache": "~1.4", "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.7-dev", + "doctrine/common": ">=2.5-dev,<2.8-dev", "doctrine/dbal": ">=2.5-dev,<2.6-dev", "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", @@ -1020,7 +1022,7 @@ "database", "orm" ], - "time": "2016-09-10 18:51:13" + "time": "2016-12-18 15:42:34" }, { "name": "evenement/evenement", @@ -1074,22 +1076,25 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", - "reference": "4393a98891a03fb7628c546aee4e5ced699c83de" + "reference": "6b8828bcc64d0861b3918e1551947112d58e4d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/4393a98891a03fb7628c546aee4e5ced699c83de", - "reference": "4393a98891a03fb7628c546aee4e5ced699c83de", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/6b8828bcc64d0861b3918e1551947112d58e4d0c", + "reference": "6b8828bcc64d0861b3918e1551947112d58e4d0c", "shasum": "" }, "require": { - "php": "^5.3.9 || ^7.0", + "paragonie/random_compat": "^1 || ^2", + "php": "^5.5.9 || ^7.0", "symfony/form": "^2.7 || ^3.0", "symfony/framework-bundle": "^2.7 || ^3.0", "symfony/security-bundle": "^2.7 || ^3.0", + "symfony/templating": "^2.7 || ^3.0", "symfony/twig-bundle": "^2.7 || ^3.0" }, "conflict": { + "doctrine/doctrine-bundle": "<1.3", "symfony/doctrine-bridge": "<2.7" }, "require-dev": { @@ -1100,11 +1105,7 @@ "symfony/console": "^2.7 || ^3.0", "symfony/phpunit-bridge": "^2.7 || ^3.0", "symfony/validator": "^2.7 || ^3.0", - "symfony/yaml": "^2.7 || ^3.0", - "willdurand/propel-typehintable-behavior": "^1.0" - }, - "suggest": { - "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation" + "symfony/yaml": "^2.7 || ^3.0" }, "type": "symfony-bundle", "extra": { @@ -1143,7 +1144,7 @@ "keywords": [ "User management" ], - "time": "2016-10-17 07:51:36" + "time": "2017-01-27 14:24:54" }, { "name": "gos/pnctl-event-loop-emitter", @@ -1350,16 +1351,16 @@ }, { "name": "gos/web-socket-bundle", - "version": "v1.8.4", + "version": "v1.8.5", "source": { "type": "git", "url": "https://github.com/GeniusesOfSymfony/WebSocketBundle.git", - "reference": "ce4efc25990c750ae61e5461f986e486294855f6" + "reference": "1c78ab0ef73650112e966330f1f2d990f1b6b930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GeniusesOfSymfony/WebSocketBundle/zipball/ce4efc25990c750ae61e5461f986e486294855f6", - "reference": "ce4efc25990c750ae61e5461f986e486294855f6", + "url": "https://api.github.com/repos/GeniusesOfSymfony/WebSocketBundle/zipball/1c78ab0ef73650112e966330f1f2d990f1b6b930", + "reference": "1c78ab0ef73650112e966330f1f2d990f1b6b930", "shasum": "" }, "require": { @@ -1419,7 +1420,7 @@ "io", "websocket" ], - "time": "2016-08-23 14:35:54" + "time": "2016-12-10 20:37:57" }, { "name": "gos/websocket-client", @@ -1737,28 +1738,28 @@ }, { "name": "guzzlehttp/promises", - "version": "1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "2693c101803ca78b27972d84081d027fca790a1e" + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/2693c101803ca78b27972d84081d027fca790a1e", - "reference": "2693c101803ca78b27972d84081d027fca790a1e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", "shasum": "" }, "require": { "php": ">=5.5.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1784,7 +1785,7 @@ "keywords": [ "promise" ], - "time": "2016-11-18 17:47:58" + "time": "2016-12-20 10:07:11" }, { "name": "guzzlehttp/psr7", @@ -1846,40 +1847,41 @@ }, { "name": "hwi/oauth-bundle", - "version": "0.5.1", + "version": "0.5.3", "source": { "type": "git", "url": "https://github.com/hwi/HWIOAuthBundle.git", - "reference": "429ae3fe1641a54ea0934bb06dac355affc41f8d" + "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/429ae3fe1641a54ea0934bb06dac355affc41f8d", - "reference": "429ae3fe1641a54ea0934bb06dac355affc41f8d", + "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1", + "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1", "shasum": "" }, "require": { "kriswallsmith/buzz": "~0.13", - "php": ">=5.3.3", - "symfony/form": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0", - "symfony/options-resolver": "~2.3|~3.0", - "symfony/security-bundle": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0" + "php": "^5.3.3|^7.0", + "symfony/form": "^2.3|^3.0", + "symfony/framework-bundle": "^2.3|^3.0", + "symfony/options-resolver": "^2.3|^3.0", + "symfony/security-bundle": "^2.3|^3.0", + "symfony/templating": "^2.7|^3.0", + "symfony/yaml": "^2.3|^3.0" }, "conflict": { "twig/twig": "<1.12" }, "require-dev": { - "doctrine/orm": "~2.3", - "fabpot/php-cs-fixer": "~1.11", - "friendsofsymfony/user-bundle": "~1.3|~2.0", - "phpunit/phpunit": "~4.8|~5.0", - "symfony/phpunit-bridge": "~2.7|~3.0", - "symfony/property-access": "~2.3|~3.0", - "symfony/stopwatch": "~2.5|~3.0", - "symfony/twig-bundle": "~2.3|~3.0", - "symfony/validator": "~2.3|~3.0" + "doctrine/orm": "^2.3", + "friendsofphp/php-cs-fixer": "^2.0", + "friendsofsymfony/user-bundle": "^1.3|^2.0", + "phpunit/phpunit": "^4.8|^5.0", + "symfony/phpunit-bridge": "^2.7|^3.0", + "symfony/property-access": "^2.3|^3.0", + "symfony/stopwatch": "^2.5|^3.0", + "symfony/twig-bundle": "^2.3|^3.0", + "symfony/validator": "^2.3|^3.0" }, "suggest": { "doctrine/doctrine-bundle": "to use Doctrine user provider", @@ -1991,7 +1993,7 @@ "yandex", "youtube" ], - "time": "2016-10-03 14:27:17" + "time": "2017-01-08 14:13:58" }, { "name": "incenteev/composer-parameter-handler", @@ -2257,16 +2259,16 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5" + "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5", - "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1", + "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1", "shasum": "" }, "require": { @@ -2274,21 +2276,21 @@ "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.23" + "twig/twig": "<1.27" }, "require-dev": { - "cssmin/cssmin": "3.0.1", - "joliclic/javascript-packer": "1.1", - "kamicane/packager": "1.0", "leafo/lessphp": "^0.3.7", "leafo/scssphp": "~0.1", - "mrclay/minify": "~2.2", + "meenie/javascript-packer": "^1.1", + "mrclay/minify": "<2.3", + "natxet/cssmin": "3.0.4", "patchwork/jsqueeze": "~1.0|~2.0", - "phpunit/phpunit": "~4.8", + "phpunit/phpunit": "~4.8 || ^5.6", "psr/log": "~1.0", "ptachoire/cssembed": "~1.0", "symfony/phpunit-bridge": "~2.7|~3.0", - "twig/twig": "~1.8|~2.0" + "twig/twig": "~1.23|~2.0", + "yfix/packager": "dev-master" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -2330,7 +2332,7 @@ "compression", "minification" ], - "time": "2015-11-12 13:51:40" + "time": "2016-11-11 18:43:20" }, { "name": "kriswallsmith/buzz", @@ -2382,16 +2384,16 @@ }, { "name": "monolog/monolog", - "version": "1.21.0", + "version": "1.22.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" + "reference": "bad29cb8d18ab0315e6c477751418a82c850d558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", - "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558", + "reference": "bad29cb8d18ab0315e6c477751418a82c850d558", "shasum": "" }, "require": { @@ -2402,7 +2404,7 @@ "psr/log-implementation": "1.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9", + "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", "jakub-onderka/php-parallel-lint": "0.9", @@ -2456,20 +2458,20 @@ "logging", "psr-3" ], - "time": "2016-07-29 03:23:52" + "time": "2016-11-26 00:15:39" }, { "name": "ocramius/package-versions", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "4b2bfc8128db95b533303942b0d5b332bffa07c6" + "reference": "51e867c70f0799790b3e82276875414ce13daaca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/4b2bfc8128db95b533303942b0d5b332bffa07c6", - "reference": "4b2bfc8128db95b533303942b0d5b332bffa07c6", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/51e867c70f0799790b3e82276875414ce13daaca", + "reference": "51e867c70f0799790b3e82276875414ce13daaca", "shasum": "" }, "require": { @@ -2477,7 +2479,8 @@ "php": "~7.0" }, "require-dev": { - "composer/composer": "^1.2.0", + "composer/composer": "^1.3", + "ext-zip": "*", "phpunit/phpunit": "^5.4.7" }, "type": "composer-plugin", @@ -2503,20 +2506,20 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2016-07-25 07:13:56" + "time": "2016-12-30 09:49:15" }, { "name": "ocramius/proxy-manager", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "51c7fdd99dba53808aaab21b34f7a55b302c160c" + "reference": "a55d08229f4f614bf335759ed0cf63378feeb2e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/51c7fdd99dba53808aaab21b34f7a55b302c160c", - "reference": "51c7fdd99dba53808aaab21b34f7a55b302c160c", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/a55d08229f4f614bf335759ed0cf63378feeb2e6", + "reference": "a55d08229f4f614bf335759ed0cf63378feeb2e6", "shasum": "" }, "require": { @@ -2527,7 +2530,8 @@ "require-dev": { "couscous/couscous": "^1.4.0", "ext-phar": "*", - "phpunit/phpunit": "^5.3.4", + "phpbench/phpbench": "^0.11.2", + "phpunit/phpunit": "^5.4.6", "squizlabs/php_codesniffer": "^2.6.0" }, "suggest": { @@ -2567,20 +2571,20 @@ "proxy pattern", "service proxies" ], - "time": "2016-07-01 12:11:54" + "time": "2016-11-04 15:53:15" }, { "name": "paragonie/random_compat", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "c0125896dbb151380ab47e96c621741e79623beb" + "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c0125896dbb151380ab47e96c621741e79623beb", - "reference": "c0125896dbb151380ab47e96c621741e79623beb", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", + "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", "shasum": "" }, "require": { @@ -2615,7 +2619,7 @@ "pseudorandom", "random" ], - "time": "2016-10-17 15:23:22" + "time": "2016-11-07 23:38:38" }, { "name": "phpcollection/phpcollection", @@ -2953,31 +2957,75 @@ "time": "2016-03-08 02:09:32" }, { - "name": "react/socket", - "version": "v0.4.3", + "name": "react/promise", + "version": "v2.5.0", "source": { "type": "git", - "url": "https://github.com/reactphp/socket.git", - "reference": "ce015ec5879b96f5d30905f035f223aa85013fcc" + "url": "https://github.com/reactphp/promise.git", + "reference": "2760f3898b7e931aa71153852dcd48a75c9b95db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/ce015ec5879b96f5d30905f035f223aa85013fcc", - "reference": "ce015ec5879b96f5d30905f035f223aa85013fcc", + "url": "https://api.github.com/repos/reactphp/promise/zipball/2760f3898b7e931aa71153852dcd48a75c9b95db", + "reference": "2760f3898b7e931aa71153852dcd48a75c9b95db", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "time": "2016-12-22 14:09:01" + }, + { + "name": "react/socket", + "version": "v0.4.6", + "source": { + "type": "git", + "url": "https://github.com/reactphp/socket.git", + "reference": "cf074e53c974df52388ebd09710a9018894745d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/socket/zipball/cf074e53c974df52388ebd09710a9018894745d2", + "reference": "cf074e53c974df52388ebd09710a9018894745d2", "shasum": "" }, "require": { "evenement/evenement": "~2.0|~1.0", "php": ">=5.3.0", "react/event-loop": "0.4.*|0.3.*", - "react/stream": "0.4.*|0.3.*" + "react/promise": "^2.0 || ^1.1", + "react/stream": "^0.4.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.4-dev" - } - }, "autoload": { "psr-4": { "React\\Socket\\": "src" @@ -2987,24 +3035,24 @@ "license": [ "MIT" ], - "description": "Library for building an evented socket server.", + "description": "Async, streaming plaintext TCP/IP and secure TLS socket server for React PHP", "keywords": [ "Socket" ], - "time": "2016-03-01 20:10:35" + "time": "2017-01-26 09:23:38" }, { "name": "react/stream", - "version": "v0.4.4", + "version": "v0.4.6", "source": { "type": "git", "url": "https://github.com/reactphp/stream.git", - "reference": "fcc9e7cea126962cff303c90c05e2efdcec09a27" + "reference": "44dc7f51ea48624110136b535b9ba44fd7d0c1ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/stream/zipball/fcc9e7cea126962cff303c90c05e2efdcec09a27", - "reference": "fcc9e7cea126962cff303c90c05e2efdcec09a27", + "url": "https://api.github.com/repos/reactphp/stream/zipball/44dc7f51ea48624110136b535b9ba44fd7d0c1ee", + "reference": "44dc7f51ea48624110136b535b9ba44fd7d0c1ee", "shasum": "" }, "require": { @@ -3035,20 +3083,20 @@ "pipe", "stream" ], - "time": "2016-08-22 09:51:07" + "time": "2017-01-25 14:44:14" }, { "name": "sensio/distribution-bundle", - "version": "v5.0.13", + "version": "v5.0.18", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281" + "reference": "17846680901003d26d823c2e3ac9228702837916" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7bc47dcfdbde6d567e1a834577d1c04ddb970281", - "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/17846680901003d26d823c2e3ac9228702837916", + "reference": "17846680901003d26d823c2e3ac9228702837916", "shasum": "" }, "require": { @@ -3087,20 +3135,20 @@ "configuration", "distribution" ], - "time": "2016-10-08 18:50:33" + "time": "2017-01-10 14:58:45" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.16", + "version": "v3.0.19", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546" + "reference": "d57c2f297d17ee82baf8cae0b16dae34a9378784" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546", - "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/d57c2f297d17ee82baf8cae0b16dae34a9378784", + "reference": "d57c2f297d17ee82baf8cae0b16dae34a9378784", "shasum": "" }, "require": { @@ -3109,14 +3157,20 @@ "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { + "symfony/asset": "~2.7|~3.0", "symfony/browser-kit": "~2.3|~3.0", "symfony/dom-crawler": "~2.3|~3.0", "symfony/expression-language": "~2.4|~3.0", "symfony/finder": "~2.3|~3.0", - "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/phpunit-bridge": "~3.2", + "symfony/psr-http-message-bridge": "^0.3", "symfony/security-bundle": "~2.4|~3.0", + "symfony/templating": "~2.3|~3.0", + "symfony/translation": "~2.3|~3.0", "symfony/twig-bundle": "~2.3|~3.0", - "twig/twig": "~1.11|~2.0" + "symfony/yaml": "~2.3|~3.0", + "twig/twig": "~1.11|~2.0", + "zendframework/zend-diactoros": "^1.3" }, "suggest": { "symfony/expression-language": "", @@ -3149,7 +3203,7 @@ "annotations", "controllers" ], - "time": "2016-03-25 17:08:27" + "time": "2017-01-10 19:42:56" }, { "name": "sensiolabs/security-checker", @@ -3262,23 +3316,24 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.3", + "version": "v5.4.5", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" + "reference": "cd142238a339459b10da3d8234220963f392540c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", - "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c", + "reference": "cd142238a339459b10da3d8234220963f392540c", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1" + "mockery/mockery": "~0.9.1", + "symfony/phpunit-bridge": "~3.2" }, "type": "library", "extra": { @@ -3311,24 +3366,24 @@ "mail", "mailer" ], - "time": "2016-07-08 11:51:25" + "time": "2016-12-29 10:02:40" }, { "name": "symfony/assetic-bundle", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d" + "reference": "0241b135ff64c6031048c6425cd833a8300da46b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/aa5b4f8b712f38745928fa845ddb73300bb2af6d", - "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/0241b135ff64c6031048c6425cd833a8300da46b", + "reference": "0241b135ff64c6031048c6425cd833a8300da46b", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.3", + "kriswallsmith/assetic": "~1.4", "php": ">=5.3.0", "symfony/console": "~2.3|~3.0", "symfony/dependency-injection": "~2.3|~3.0", @@ -3337,7 +3392,7 @@ }, "conflict": { "kriswallsmith/spork": "<=0.2", - "twig/twig": "<1.20" + "twig/twig": "<1.27" }, "require-dev": { "kriswallsmith/spork": "~0.3", @@ -3355,7 +3410,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -3381,20 +3436,20 @@ "compression", "minification" ], - "time": "2015-12-28 13:12:39" + "time": "2016-11-22 11:42:57" }, { "name": "symfony/monolog-bundle", - "version": "2.11.1", + "version": "v2.12.1", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "e7caf4936c7be82bc6d68df87f1d23a0d5bf6e00" + "reference": "b0146bdca7ba2a65f3bbe7010423c7393b29ec3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/e7caf4936c7be82bc6d68df87f1d23a0d5bf6e00", - "reference": "e7caf4936c7be82bc6d68df87f1d23a0d5bf6e00", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/b0146bdca7ba2a65f3bbe7010423c7393b29ec3f", + "reference": "b0146bdca7ba2a65f3bbe7010423c7393b29ec3f", "shasum": "" }, "require": { @@ -3441,20 +3496,20 @@ "log", "logging" ], - "time": "2016-04-13 16:21:01" + "time": "2017-01-02 19:04:26" }, { "name": "symfony/polyfill-apcu", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "6d58bceaeea2c2d3eb62503839b18646e161cd6b" + "reference": "5d4474f447403c3348e37b70acc2b95475b7befa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/6d58bceaeea2c2d3eb62503839b18646e161cd6b", - "reference": "6d58bceaeea2c2d3eb62503839b18646e161cd6b", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa", + "reference": "5d4474f447403c3348e37b70acc2b95475b7befa", "shasum": "" }, "require": { @@ -3463,7 +3518,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3494,20 +3549,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f" + "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/0f8dc2c45f69f8672379e9210bca4a115cd5146f", - "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2d6e2b20d457603eefb6e614286c22efca30fdb4", + "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4", "shasum": "" }, "require": { @@ -3520,7 +3575,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3552,20 +3607,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "dff51f72b0706335131b00a7f49606168c582594" + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", - "reference": "dff51f72b0706335131b00a7f49606168c582594", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", "shasum": "" }, "require": { @@ -3577,7 +3632,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3611,20 +3666,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-php56", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a" + "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a", - "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c", + "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c", "shasum": "" }, "require": { @@ -3634,7 +3689,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3667,20 +3722,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-php70", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85" + "reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/a42f4b6b05ed458910f8af4c4e1121b0101b2d85", - "reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/13ce343935f0f91ca89605a2f6ca6f5c2f3faac2", + "reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2", "shasum": "" }, "require": { @@ -3690,7 +3745,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3726,20 +3781,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-util", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99" + "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99", - "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb", + "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb", "shasum": "" }, "require": { @@ -3748,7 +3803,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3778,32 +3833,34 @@ "polyfill", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.11", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690" + "reference": "ad751095576ce0c12a284e30e3fff80c91f27225" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/5e1a90f28213231ceee19c953bbebc5b5b95c690", - "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ad751095576ce0c12a284e30e3fff80c91f27225", + "reference": "ad751095576ce0c12a284e30e3fff80c91f27225", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/config": "~2.3|~3.0", - "symfony/dependency-injection": "~2.3|~3.0", - "symfony/http-kernel": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0" + "symfony/config": "~2.7|~3.0", + "symfony/dependency-injection": "~2.7|~3.0", + "symfony/http-kernel": "~2.7|~3.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0" + "symfony/console": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -3811,7 +3868,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -3835,20 +3892,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2016-01-15 16:41:20" + "time": "2016-12-20 04:44:33" }, { "name": "symfony/symfony", - "version": "v3.1.5", + "version": "v3.1.10", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "e7e1d01fe103de78bca6fbf7f6f4acf64482d63c" + "reference": "96e7dede3ddc9e3b3392f5cc93e26eca77545a89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/e7e1d01fe103de78bca6fbf7f6f4acf64482d63c", - "reference": "e7e1d01fe103de78bca6fbf7f6f4acf64482d63c", + "url": "https://api.github.com/repos/symfony/symfony/zipball/96e7dede3ddc9e3b3392f5cc93e26eca77545a89", + "reference": "96e7dede3ddc9e3b3392f5cc93e26eca77545a89", "shasum": "" }, "require": { @@ -3861,7 +3918,7 @@ "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "twig/twig": "~1.26|~2.0" + "twig/twig": "~1.28|~2.0" }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0", @@ -3930,6 +3987,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0", "predis/predis": "~1.0", + "sensio/framework-extra-bundle": "^3.0.2", "symfony/phpunit-bridge": "~3.2", "symfony/polyfill-apcu": "~1.1", "symfony/security-acl": "~2.8|~3.0" @@ -3976,33 +4034,98 @@ "keywords": [ "framework" ], - "time": "2016-10-03 19:01:14" + "time": "2017-01-28 02:53:38" }, { - "name": "twig/twig", - "version": "v1.26.1", + "name": "symfony/translation", + "version": "v3.2.2", "source": { "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d" + "url": "https://github.com/symfony/translation.git", + "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a09d8ee17ac1cfea29ed60c83960ad685c6a898d", - "reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d", + "url": "https://api.github.com/repos/symfony/translation/zipball/6520f3d4cce604d9dd1e86cac7af954984dd9bda", + "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda", "shasum": "" }, "require": { - "php": ">=5.2.7" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/config": "<2.8" }, "require-dev": { - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" + "psr/log": "~1.0", + "symfony/config": "~2.8|~3.0", + "symfony/intl": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" + }, + "suggest": { + "psr/log": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.26-dev" + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "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 Translation Component", + "homepage": "https://symfony.com", + "time": "2017-01-02 20:32:22" + }, + { + "name": "twig/twig", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "9062992538bc5855a683c6737257bfa18d25a4b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9062992538bc5855a683c6737257bfa18d25a4b8", + "reference": "9062992538bc5855a683c6737257bfa18d25a4b8", + "shasum": "" + }, + "require": { + "php": "^7.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" } }, "autoload": { @@ -4037,24 +4160,24 @@ "keywords": [ "templating" ], - "time": "2016-10-05 18:57:41" + "time": "2017-01-11 19:39:01" }, { "name": "zendframework/zend-code", - "version": "3.0.4", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "c5272131d3acb0f470a2462ed088fca3b6ba61c2" + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c5272131d3acb0f470a2462ed088fca3b6ba61c2", - "reference": "c5272131d3acb0f470a2462ed088fca3b6ba61c2", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", "shasum": "" }, "require": { - "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { @@ -4071,8 +4194,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -4090,30 +4213,30 @@ "code", "zf2" ], - "time": "2016-06-30 22:35:27" + "time": "2016-10-24 13:23:32" }, { "name": "zendframework/zend-eventmanager", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e" + "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/5c80bdee0e952be112dcec0968bad770082c3a6e", - "reference": "5c80bdee0e952be112dcec0968bad770082c3a6e", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/c3bce7b7d47c54040b9ae51bc55491c72513b75d", + "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { "athletic/athletic": "^0.1", "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0", + "phpunit/phpunit": "^5.6", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-stdlib": "^2.7.3 || ^3.0" }, "suggest": { @@ -4123,8 +4246,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -4144,39 +4267,39 @@ "events", "zf2" ], - "time": "2016-02-18 20:53:00" + "time": "2016-12-19 21:47:12" } ], "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v3.0.11", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c" + "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c", - "reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ec278c0bd530edf155c4a00900577b5cb80f559e", + "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e", "shasum": "" }, "require": { "symfony/console": "~2.7|~3.0", "symfony/framework-bundle": "~2.7|~3.0", "symfony/process": "~2.7|~3.0", - "symfony/yaml": "~2.7|~3.0" + "symfony/yaml": "~2.7|~3.0", + "twig/twig": "^1.28.2|^2.0" }, "require-dev": { "doctrine/orm": "~2.4", - "symfony/doctrine-bridge": "~2.7|~3.0", - "twig/twig": "~1.18" + "symfony/doctrine-bridge": "~2.7|~3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -4198,20 +4321,20 @@ } ], "description": "This bundle generates code for you", - "time": "2016-10-10 14:17:42" + "time": "2016-12-05 16:01:19" }, { "name": "symfony/phpunit-bridge", - "version": "v3.1.5", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9" + "reference": "d32e4062c3a3dfb95709d2ca6dd89a327ae51c3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1f4e2059cf4ecae1053b9c3027b3fc548fd077b9", - "reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d32e4062c3a3dfb95709d2ca6dd89a327ae51c3b", + "reference": "d32e4062c3a3dfb95709d2ca6dd89a327ae51c3b", "shasum": "" }, "require": { @@ -4220,10 +4343,13 @@ "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" }, + "bin": [ + "bin/simple-phpunit" + ], "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -4253,7 +4379,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2016-08-19 06:48:39" + "time": "2017-01-06 17:19:17" } ], "aliases": [], diff --git a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig index b77b4d1..c4ebf69 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'FOSUserBundle' %} -{% block title %} - Sign up{% endblock %} +{% block title %} - Registration{% endblock %} {% block fos_user_content %}
@@ -12,7 +12,7 @@ border="0"/> -

Sign up

+

Registration

diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig index 9d17cb0..06ff44a 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'FOSUserBundle' %} -{% block title %} - Sign in{% endblock %} +{% block title %} - Login{% endblock %} {% block fos_user_content %} {% if error %} @@ -16,7 +16,7 @@ border="0"/>
-

Sign in

+

Login

diff --git a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css index 6926200..00ef338 100644 --- a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css +++ b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css @@ -167,7 +167,8 @@ main .user-list-container .user-friend h1 { text-align: center; } -main .user-list-container .user-friend img { +main .user-list-container .user-friend .img, +main .user-list-container .user-friend .img img { width: 100%; } @@ -264,6 +265,11 @@ main .user-request-container h1 { color: #fff; } +main .user-request-container .img, +main .user-request-container .img img { + width: 100%; +} + main .user-request-container button { background: #fff; width: 100%; diff --git a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig index 6df9f60..a9ec280 100644 --- a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig +++ b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig @@ -48,8 +48,8 @@ {{ 'layout.logout'|trans({}, 'FOSUserBundle') }} {% else %} - Sign up · - Sign in + Registration · + Login {% endif %}

diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 7e7723a..7e7a99d 100644 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -780,7 +780,11 @@ class SymfonyRequirements extends RequirementCollection { $size = ini_get('realpath_cache_size'); $size = trim($size); - $unit = strtolower(substr($size, -1, 1)); + $unit = ''; + if (!ctype_digit($size)) { + $unit = strtolower(substr($size, -1, 1)); + $size = (int) substr($size, 0, -1); + } switch ($unit) { case 'g': return $size * 1024 * 1024 * 1024; diff --git a/web/config.php b/web/config.php index a031a3a..69df43c 100644 --- a/web/config.php +++ b/web/config.php @@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems); } .sf-reset ul a, .sf-reset ul a:hover { - background: url(../images/blue-arrow.png) no-repeat right 6px; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px; padding-right: 10px; } .sf-reset ul, ol {