From a5398c7125f589f0e28fef17cbcf3c351690e671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Rapha=C3=ABl=20Giraud?= <prgiraud@me.com> Date: Thu, 2 Nov 2017 15:02:29 +0100 Subject: [PATCH] . --- .DS_Store | Bin 0 -> 10244 bytes app/Resources/views/base.html.twig | 1 + app/config/config_prod.yml | 2 +- app/config/security.yml | 5 +- composer.json | 3 +- composer.lock | 903 ++++++++---------- src/.DS_Store | Bin 0 -> 6148 bytes .../Controller/DefaultController.php | 15 +- src/BackendBundle/.DS_Store | Bin 0 -> 6148 bytes .../.NotificationController.php.swo | Bin 0 -> 16384 bytes .../.NotificationController.php.swp | Bin 0 -> 20480 bytes .../Controller/EntityBrowserController.php | 2 +- .../Controller/NotificationController.php | 51 +- .../Controller/NotificationController.php~ | 135 +++ src/BackendBundle/Entity/League.php | 6 + src/BackendBundle/Entity/Transaction.php | 2 +- src/BackendBundle/Form/PredictionType.php | 3 +- .../Repository/DeviceRepository.php | 8 +- .../Repository/LeagueRepository.php | 16 +- .../views/notification/list.html.twig | 12 +- .../Resources/views/prediction/list.html.twig | 4 +- tests/.DS_Store | Bin 0 -> 6148 bytes tests/ApiBundle/.DS_Store | Bin 0 -> 6148 bytes tests/ApiBundle/Controller/.DS_Store | Bin 0 -> 6148 bytes tests/AppBundle/.DS_Store | Bin 0 -> 6148 bytes tests/AppBundle/Controller/.DS_Store | Bin 0 -> 6148 bytes var/SymfonyRequirements.php | 12 +- web/.DS_Store | Bin 0 -> 6148 bytes web/config.php | 4 +- web/css/.DS_Store | Bin 0 -> 6148 bytes 30 files changed, 624 insertions(+), 560 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/BackendBundle/.DS_Store create mode 100644 src/BackendBundle/Controller/.NotificationController.php.swo create mode 100644 src/BackendBundle/Controller/.NotificationController.php.swp create mode 100644 src/BackendBundle/Controller/NotificationController.php~ create mode 100644 tests/.DS_Store create mode 100644 tests/ApiBundle/.DS_Store create mode 100644 tests/ApiBundle/Controller/.DS_Store create mode 100644 tests/AppBundle/.DS_Store create mode 100644 tests/AppBundle/Controller/.DS_Store create mode 100644 web/.DS_Store create mode 100644 web/css/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9189838bfe07505ad778e6a9cf017b8c8977dada GIT binary patch literal 10244 zcmZQzU|@7AO)+F(P+(wS;9!8z0z3>@0Z1N%F(jFwA~GQJ7#IW?7%~}>7;+d=J#+Gt zp>m_tXb6mkz-S1JhQMeDjE2DA3IRrlb2zvm^e8zR0;3@?8UpYT0F@7*4g!dFfVA-$ z8Xz=Ch=GxT0o(;(WME){X<`KT0~kPZAgv%8q!mPiv@$S)SYR{2S{WFjS{cFJ5Rg6r zuu+WQt_g?_*3Q5PwwZx}5o|L910zH`10&RCMraR(5u%-e5o|jH10zH`*vwI4Gz3ON z05t?aeRmE9J%&VvJceTA{(DkRei8#DGrKV`FlhV-1F&XJ20aEBhG2$xhG2#ghJ1!1 zNRJ;?2jdH{hW}t4EDU-K=?s|+C7_W3Bz0%dOy+{AW5{GkXUM~5He(Q)9+2zH7!n!M z8H&KZK(mAK2AX<ihD3$}h5|H~crY+9^dh+!sw%0xxB%+jlSu_RnZ+dr2G<#xm|0la z*f}^kIXQVbVuLgC%Y#c2OG=BK5{sh2yv&r;Bq%#1KR*Y~PD~2ROf8QW5OL1WD@n}E zOD#fD9uuCKmy%!ZlwX>cQVcdHAh9GPDX|D_QM`aeb+w_Xg^q%uv2m@ALbbVtnT~>~ zrDbg`2Zy+-p{-{^Ze>+<O>NywaFD}GN(O!iA5P9<U|@iHuPnGIFDE}Q9b6!TM3WdY z8S>DA1{6s%kb;JnA(<hcA(x?mA)ld`A(f$sL60Gep_m~bT_-rIW-u@?aQ=rR18h2T z81fmC8M0CB1V<XOoze{H4EYTC4C$cZB?euny=4rU49N_s47v=749Q?ul``Zpl;Cm? zgBt?_BL|XC1Q-e!G8hUNK)N!)`YIT58FCo(7*ZHA8H%wbR}}r63_%R842}#g489Dm z40;T?3@K>-2tu=wnW31Wh#?tG)eVp;1_lNmXgEPtAtk=k1D*J!s;dnRjdc`sjf^co zsn5{Jz*I-U%*+rY`OStTG+0HAk^JU>lOH%3(2^f3LkUAFDA*Z_Q3D7ZaTOqa&;UYG zi4;gbV1aZKo<q5~xwyHx1q8VW<Wgu(1Lrz2b8Jj7B-e*$rj%sF3y203rIux;mIox} zrG{k|XC`IlWR_HNaDp;(ynuLhwV{QDj)Ji{C@>LOSzr+dhqR`tqi<wEZP%j3OO`HM zzT(gkv=9}B@Zsc91_lPC5J3x7ZiX=A(vcyJArq8|&_ehO0|O%{gxR4X%*+5PQ;Sel zfig5>1yTlrszQo`6R<cKs8UkAy4u80N5KMIM&eGTpkfJB>Oq^67^xIgh(djb7M^Sj zWelkdc?>C_+6gs$7(k(jT<<Y6lry9<B%!JT6>i|L=75JaSk<r%MX>MCLJ^*LM;W6b zFd71*Aut*OqaiRF0(1=lW{7PHpz(iK1_oU7{}5H9<Y)+thQP240Y(;=U>7G)ZwQC? zKx6Ho@$>|!JgCzI8qH?}jn6~$fs}xT_QAvPOprxI8X)D23=9S!8iW}c7{J5vj0}*` d`~jN`0Qd8u{dF*VwEsWa{|BW|I3D)>e*mh*B9H(8 literal 0 HcmV?d00001 diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 5337914..0010fc0 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -4,6 +4,7 @@ <meta charset="UTF-8" /> <title>{% block title %}Welcome!{% endblock %}</title> <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" /> + <link rel="apple-touch-icon" href="{{ asset('apple-touch-icon.png') }} /"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Material Design fonts --> <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700"> diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 192f0c5..2f78e00 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -11,7 +11,7 @@ monolog: handlers: main: type: fingers_crossed - action_level: error + action_level: warning handler: nested nested: type: stream diff --git a/app/config/security.yml b/app/config/security.yml index 41a7c1d..3f4ef77 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -10,7 +10,10 @@ security: password: $2y$12$fDfPfwAymIT0xEtPDVxATuh39PEh1q7x45d9IOM5e3J87KQtRAcVa roles: 'ROLE_ADMIN' betskills: - password: $2y$12$tkAwLaRwYIXSjr3iPFBYlebEKX.wLxLp10w8o3oAhkPQTbdLBQHoq + password: $2a$04$uKSPdigufFVA0judefbqPObYoNlJOpN25g9VT1Ml.A9yfZ4qmVU8i + roles: 'ROLE_ADMIN' + PR: + password: $2a$07$2Cy7Fwzqa1mJSFqIWjaGy.D9QVkj3MNFkz2DoF/DGj1QL2OAlOGIy roles: 'ROLE_ADMIN' firewalls: diff --git a/composer.json b/composer.json index 2872d53..5ea1c07 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "sensio/framework-extra-bundle": "^3.0.2", "incenteev/composer-parameter-handler": "^2.0", "jms/serializer-bundle": "^1.1", - "friendsofsymfony/rest-bundle": "^2.1" + "friendsofsymfony/rest-bundle": "^2.1", + "guzzlehttp/guzzle": "^6.3", }, "require-dev": { "sensio/generator-bundle": "^3.0", diff --git a/composer.lock b/composer.lock index ed8297d..a169283 100644 --- a/composer.lock +++ b/composer.lock @@ -4,40 +4,98 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "e2ad80fd5d559db7f34d32407738a93b", - "content-hash": "6dd49f9599d38261eba217230b75a721", + "content-hash": "cf822710bb7cb6e61bb4d3ece888646c", "packages": [ + { + "name": "composer/ca-bundle", + "version": "1.0.7", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b17e6153cb7f33c7e44eb59578dc12eee5dc8e12", + "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5", + "psr/log": "^1.0", + "symfony/process": "^2.5 || ^3.0" + }, + "suggest": { + "symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "time": "2017-03-06T11:59:08+00:00" + }, { "name": "doctrine/annotations", - "version": "v1.2.7", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" + "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", + "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", "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.7" }, "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/", @@ -73,20 +131,20 @@ "docblock", "parser" ], - "time": "2015-08-31 12:32:49" + "time": "2017-02-24T16:22:25+00:00" }, { "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": { @@ -143,32 +201,33 @@ "cache", "caching" ], - "time": "2015-12-31 16:37:02" + "time": "2016-10-29T11:16:17+00:00" }, { "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": { @@ -209,20 +268,20 @@ "collections", "iterator" ], - "time": "2015-04-14 22:21:58" + "time": "2017-01-03T10:49:41+00:00" }, { "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": { @@ -231,10 +290,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": { @@ -282,24 +341,24 @@ "persistence", "spl" ], - "time": "2015-12-25 13:18:31" + "time": "2017-01-13T14:02:13+00:00" }, { "name": "doctrine/dbal", - "version": "v2.5.5", + "version": "v2.5.12", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9" + "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9", - "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44", + "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44", "shasum": "" }, "require": { - "doctrine/common": ">=2.4,<2.7-dev", + "doctrine/common": ">=2.4,<2.8-dev", "php": ">=5.3.2" }, "require-dev": { @@ -353,41 +412,41 @@ "persistence", "queryobject" ], - "time": "2016-09-09 19:13:33" + "time": "2017-02-08T12:53:47+00:00" }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.4", + "version": "1.6.8", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7" + "reference": "6e96577cbbdbb5b6dcca2ff203d665976b51beb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/dd40b0a7fb16658cda9def9786992b8df8a49be7", - "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/6e96577cbbdbb5b6dcca2ff203d665976b51beb0", + "reference": "6e96577cbbdbb5b6dcca2ff203d665976b51beb0", "shasum": "" }, "require": { "doctrine/dbal": "~2.3", - "doctrine/doctrine-cache-bundle": "~1.0", + "doctrine/doctrine-cache-bundle": "~1.2", "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|~4.0", + "symfony/dependency-injection": "~2.7|~3.0|~4.0", + "symfony/doctrine-bridge": "~2.7|~3.0|~4.0", + "symfony/framework-bundle": "~2.7|~3.0|~4.0" }, "require-dev": { "doctrine/orm": "~2.3", "phpunit/phpunit": "~4", - "satooshi/php-coveralls": "~0.6.1", - "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" + "satooshi/php-coveralls": "^1.0", + "symfony/phpunit-bridge": "~2.7|~3.0|~4.0", + "symfony/property-info": "~2.8|~3.0|~4.0", + "symfony/validator": "~2.7|~3.0|~4.0", + "symfony/yaml": "~2.7|~3.0|~4.0", + "twig/twig": "~1.12|~2.0" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -434,7 +493,7 @@ "orm", "persistence" ], - "time": "2016-08-10 15:35:22" + "time": "2017-05-18T08:15:18+00:00" }, { "name": "doctrine/doctrine-cache-bundle", @@ -522,7 +581,7 @@ "cache", "caching" ], - "time": "2016-01-26 17:28:51" + "time": "2016-01-26T17:28:51+00:00" }, { "name": "doctrine/inflector", @@ -589,7 +648,7 @@ "singularize", "string" ], - "time": "2015-11-06 14:35:42" + "time": "2015-11-06T14:35:42+00:00" }, { "name": "doctrine/instantiator", @@ -643,7 +702,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "doctrine/lexer", @@ -697,26 +756,26 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" + "time": "2014-09-09T13:34:57+00: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": "*", @@ -773,21 +832,21 @@ "database", "orm" ], - "time": "2016-09-10 18:51:13" + "time": "2016-12-18T15:42:34+00:00" }, { "name": "eightpoints/guzzle-bundle", - "version": "v5.0.3", + "version": "v5.3.0", "target-dir": "EightPoints/Bundle/GuzzleBundle", "source": { "type": "git", "url": "https://github.com/8p/GuzzleBundle.git", - "reference": "9afc670d5b730ab1d90d92f50b86fa5282279d28" + "reference": "59f0b3079954716a3be32a8537003be2540ad156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/8p/GuzzleBundle/zipball/9afc670d5b730ab1d90d92f50b86fa5282279d28", - "reference": "9afc670d5b730ab1d90d92f50b86fa5282279d28", + "url": "https://api.github.com/repos/8p/GuzzleBundle/zipball/59f0b3079954716a3be32a8537003be2540ad156", + "reference": "59f0b3079954716a3be32a8537003be2540ad156", "shasum": "" }, "require": { @@ -837,7 +896,7 @@ "symfony", "web service" ], - "time": "2016-09-30 17:12:30" + "time": "2016-12-30T13:35:37+00:00" }, { "name": "eightpoints/guzzle-wsse-middleware", @@ -892,124 +951,37 @@ "web service", "wsse" ], - "time": "2016-06-03 14:03:33" - }, - { - "name": "firebase/php-jwt", - "version": "v3.0.0", - "source": { - "type": "git", - "url": "https://github.com/firebase/php-jwt.git", - "reference": "fa8a06e96526eb7c0eeaa47e4f39be59d21f16e1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/fa8a06e96526eb7c0eeaa47e4f39be59d21f16e1", - "reference": "fa8a06e96526eb7c0eeaa47e4f39be59d21f16e1", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Firebase\\JWT\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Neuman Vong", - "email": "neuman+pear@twilio.com", - "role": "Developer" - }, - { - "name": "Anant Narayanan", - "email": "anant@php.net", - "role": "Developer" - } - ], - "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", - "homepage": "https://github.com/firebase/php-jwt", - "time": "2015-07-22 18:31:08" - }, - { - "name": "firebase/token-generator", - "version": "v3.0.0", - "source": { - "type": "git", - "url": "https://github.com/firebase/firebase-token-generator-php.git", - "reference": "60f74f02ae9e0ab498def706bdf43582379086f6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/firebase/firebase-token-generator-php/zipball/60f74f02ae9e0ab498def706bdf43582379086f6", - "reference": "60f74f02ae9e0ab498def706bdf43582379086f6", - "shasum": "" - }, - "require": { - "firebase/php-jwt": "^3.0", - "php": ">=5.4" - }, - "require-dev": { - "phpunit/phpunit": "^4.6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Firebase\\Token\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anant Narayanan", - "email": "anant@php.net", - "role": "Developer" - }, - { - "name": "Chris Raynor", - "email": "chris@firebase.com", - "role": "Developer" - } - ], - "description": "A simple library to generate JWT tokens for authenticating to a Firebase.", - "homepage": "https://github.com/firebase/firebase-token-generator-php", - "time": "2015-11-19 06:18:40" + "time": "2016-06-03T14:03:33+00:00" }, { "name": "friendsofsymfony/rest-bundle", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "c2ab644087d3ce234e2cbe6a7aa114e8bc721174" + "reference": "d62a6c0f4bc699f899865d7e7bc7a4186aef9a86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/c2ab644087d3ce234e2cbe6a7aa114e8bc721174", - "reference": "c2ab644087d3ce234e2cbe6a7aa114e8bc721174", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/d62a6c0f4bc699f899865d7e7bc7a4186aef9a86", + "reference": "d62a6c0f4bc699f899865d7e7bc7a4186aef9a86", "shasum": "" }, "require": { "doctrine/inflector": "^1.0", "php": "^5.5.9|~7.0", "psr/log": "^1.0", + "symfony/config": "^2.7|^3.0", + "symfony/debug": "^2.7|^3.0", + "symfony/dependency-injection": "^2.7|^3.0", + "symfony/event-dispatcher": "^2.7|^3.0", "symfony/finder": "^2.7|^3.0", "symfony/framework-bundle": "^2.7|^3.0", + "symfony/http-foundation": "^2.7|^3.0", + "symfony/http-kernel": "^2.7|^3.0", "symfony/routing": "^2.7|^3.0", + "symfony/security-core": "^2.7|^3.0", + "symfony/templating": "^2.7|^3.0", "willdurand/jsonp-callback-validator": "^1.0", "willdurand/negotiation": "^2.0" }, @@ -1020,13 +992,15 @@ "require-dev": { "jms/serializer-bundle": "^1.0", "phpoption/phpoption": "^1.1", + "psr/http-message": "^1.0", "sensio/framework-extra-bundle": "^3.0.13", + "symfony/asset": "^2.7|^3.0", "symfony/browser-kit": "^2.7|^3.0", "symfony/css-selector": "^2.7|^3.0", "symfony/dependency-injection": "^2.7|^3.0", "symfony/expression-language": "~2.7|^3.0", "symfony/form": "^2.7|^3.0", - "symfony/phpunit-bridge": "~2.7|^3.0", + "symfony/phpunit-bridge": "^3.2", "symfony/security-bundle": "^2.7|^3.0", "symfony/serializer": "^2.7.11|^3.0.4", "symfony/twig-bundle": "^2.7|^3.0", @@ -1044,13 +1018,16 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { "psr-4": { "FOS\\RestBundle\\": "" - } + }, + "exclude-from-classmap": [ + "Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1075,80 +1052,35 @@ "keywords": [ "rest" ], - "time": "2016-09-07 15:10:55" - }, - { - "name": "google/auth", - "version": "v0.9", - "source": { - "type": "git", - "url": "https://github.com/google/google-auth-library-php.git", - "reference": "47c3c6bece495e58381a21fed13a735bd23a51cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/47c3c6bece495e58381a21fed13a735bd23a51cc", - "reference": "47c3c6bece495e58381a21fed13a735bd23a51cc", - "shasum": "" - }, - "require": { - "firebase/php-jwt": "~2.0|~3.0", - "guzzlehttp/guzzle": "~5.3|~6.0", - "guzzlehttp/psr7": "~1.2", - "php": ">=5.4", - "psr/cache": "^1.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^1.11", - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ], - "psr-4": { - "Google\\Auth\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Google Auth Library for PHP", - "homepage": "http://github.com/google/google-auth-library-php", - "keywords": [ - "Authentication", - "google", - "oauth2" - ], - "time": "2016-06-01 22:07:52" + "time": "2017-04-06T12:55:03+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.2.2", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60" + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60", - "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "shasum": "" }, "require": { "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.3.1", + "guzzlehttp/psr7": "^1.4", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.0 || ^5.0", "psr/log": "^1.0" }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, "type": "library", "extra": { "branch-alias": { @@ -1185,32 +1117,32 @@ "rest", "web service" ], - "time": "2016-10-08 15:01:37" + "time": "2017-06-22T18:50:49+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.2.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579" + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579", - "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579", + "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": { @@ -1236,20 +1168,20 @@ "keywords": [ "promise" ], - "time": "2016-05-18 16:56:05" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.3.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", - "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { @@ -1285,16 +1217,23 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" } ], - "description": "PSR-7 message implementation", + "description": "PSR-7 message implementation that also provides common utility methods", "keywords": [ "http", "message", + "request", + "response", "stream", - "uri" + "uri", + "url" ], - "time": "2016-06-24 23:00:38" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "incenteev/composer-parameter-handler", @@ -1345,7 +1284,7 @@ "keywords": [ "parameters management" ], - "time": "2015-11-10 17:04:01" + "time": "2015-11-10T17:04:01+00:00" }, { "name": "jdorn/sql-formatter", @@ -1395,27 +1334,28 @@ "highlight", "sql" ], - "time": "2014-01-12 16:20:24" + "time": "2014-01-12T16:20:24+00:00" }, { "name": "jms/metadata", - "version": "1.5.1", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "22b72455559a25777cfd28c4ffda81ff7639f353" + "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353", - "reference": "22b72455559a25777cfd28c4ffda81ff7639f353", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab", + "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "doctrine/cache": "~1.0" + "doctrine/cache": "~1.0", + "symfony/cache": "~3.1" }, "type": "library", "extra": { @@ -1430,14 +1370,12 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache" + "Apache-2.0" ], "authors": [ { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "Class/method/property metadata management in PHP", @@ -1447,7 +1385,7 @@ "xml", "yaml" ], - "time": "2014-07-12 07:13:19" + "time": "2016-12-05T10:18:33+00:00" }, { "name": "jms/parser-lib", @@ -1482,20 +1420,20 @@ "Apache2" ], "description": "A library for easily creating recursive-descent parsers.", - "time": "2012-11-18 18:08:43" + "time": "2012-11-18T18:08:43+00:00" }, { "name": "jms/serializer", - "version": "1.3.1", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "705d0b4633b9c44e6253aa18306b3972282cd3a3" + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/705d0b4633b9c44e6253aa18306b3972282cd3a3", - "reference": "705d0b4633b9c44e6253aa18306b3972282cd3a3", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/4fad8bbbe76e05de3b79ffa3db027058ed3813ff", + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff", "shasum": "" }, "require": { @@ -1508,28 +1446,33 @@ "phpoption/phpoption": "^1.1" }, "conflict": { + "jms/serializer-bundle": "<1.2.1", "twig/twig": "<1.12" }, "require-dev": { "doctrine/orm": "~2.1", "doctrine/phpcr-odm": "^1.3|^2.0", + "ext-pdo_sqlite": "*", "jackalope/jackalope-doctrine-dbal": "^1.1.5", "phpunit/phpunit": "^4.8|^5.0", "propel/propel1": "~1.7", + "symfony/expression-language": "^2.6|^3.0", "symfony/filesystem": "^2.1", - "symfony/form": "~2.1", - "symfony/translation": "^2.1", - "symfony/validator": "^2.2", - "symfony/yaml": "^2.1", + "symfony/form": "~2.1|^3.0", + "symfony/translation": "^2.1|^3.0", + "symfony/validator": "^2.2|^3.0", + "symfony/yaml": "^2.1|^3.0", "twig/twig": "~1.12|~2.0" }, "suggest": { + "doctrine/cache": "Required if you like to use cache functionality.", + "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.", "symfony/yaml": "Required if you'd like to serialize data to YAML format." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -1539,7 +1482,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache2" + "Apache-2.0" ], "authors": [ { @@ -1556,25 +1499,25 @@ "serialization", "xml" ], - "time": "2016-08-23 17:20:24" + "time": "2017-05-15T08:35:42+00:00" }, { "name": "jms/serializer-bundle", - "version": "1.1.0", + "version": "1.5.0", "target-dir": "JMS/SerializerBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e" + "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3e396c980545350c2efb65a50041d2a9f9d6562e", - "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/85ee039a2b7f89d77c403e33cee7b43a875c31e5", + "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5", "shasum": "" }, "require": { - "jms/serializer": "^1.0.0", + "jms/serializer": "^1.7", "php": ">=5.4.0", "phpoption/phpoption": "^1.1.0", "symfony/framework-bundle": "~2.3|~3.0" @@ -1582,9 +1525,11 @@ "require-dev": { "doctrine/doctrine-bundle": "*", "doctrine/orm": "*", + "phpunit/phpunit": "^4.2|^5.0", "symfony/browser-kit": "*", "symfony/class-loader": "*", "symfony/css-selector": "*", + "symfony/expression-language": "~2.6|~3.0", "symfony/finder": "*", "symfony/form": "*", "symfony/process": "*", @@ -1599,7 +1544,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -1609,7 +1554,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache2" + "Apache-2.0" ], "authors": [ { @@ -1626,82 +1571,20 @@ "serialization", "xml" ], - "time": "2015-11-10 12:26:42" - }, - { - "name": "kreait/firebase-php", - "version": "2.0.0-beta2", - "source": { - "type": "git", - "url": "https://github.com/kreait/firebase-php.git", - "reference": "ebee678764737f4163a9d4bd033b4565143cce4d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kreait/firebase-php/zipball/ebee678764737f4163a9d4bd033b4565143cce4d", - "reference": "ebee678764737f4163a9d4bd033b4565143cce4d", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "firebase/token-generator": "^3.0", - "google/auth": "^0.9.0", - "guzzlehttp/guzzle": "^6.2.1", - "mtdowling/jmespath.php": "^2.3", - "php": "^7.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "^1.11", - "phpunit/phpunit": "^5.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.0": "1.x-dev", - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Firebase\\": "src/Firebase" - }, - "files": [ - "src/Firebase.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jérôme Gamez", - "homepage": "https://github.com/jeromegamez" - } - ], - "description": "PHP SDK for Google Firebase", - "homepage": "https://github.com/kreait/firebase-php", - "keywords": [ - "api", - "database", - "firebase", - "google", - "sdk" - ], - "time": "2016-10-11 13:13:47" + "time": "2017-05-10T10:17:17+00:00" }, { "name": "monolog/monolog", - "version": "1.21.0", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", - "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", "shasum": "" }, "require": { @@ -1712,7 +1595,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", @@ -1722,7 +1605,7 @@ "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "~5.3" + "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -1766,75 +1649,20 @@ "logging", "psr-3" ], - "time": "2016-07-29 03:23:52" - }, - { - "name": "mtdowling/jmespath.php", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "192f93e43c2c97acde7694993ab171b3de284093" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/192f93e43c2c97acde7694993ab171b3de284093", - "reference": "192f93e43c2c97acde7694993ab171b3de284093", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "bin": [ - "bin/jp.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "psr-4": { - "JmesPath\\": "src/" - }, - "files": [ - "src/JmesPath.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Declaratively specify how to extract elements from a JSON document", - "keywords": [ - "json", - "jsonpath" - ], - "time": "2016-01-05 18:25:05" + "time": "2017-06-19T01:22:40+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.2", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf" + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf", - "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", "shasum": "" }, "require": { @@ -1869,7 +1697,7 @@ "pseudorandom", "random" ], - "time": "2016-04-03 06:00:07" + "time": "2017-03-13T16:27:32+00:00" }, { "name": "phpcollection/phpcollection", @@ -1917,7 +1745,7 @@ "sequence", "set" ], - "time": "2015-05-17 12:39:23" + "time": "2015-05-17T12:39:23+00:00" }, { "name": "phpoption/phpoption", @@ -1967,7 +1795,7 @@ "php", "type" ], - "time": "2015-07-25 16:39:46" + "time": "2015-07-25T16:39:46+00:00" }, { "name": "psr/cache", @@ -2013,7 +1841,7 @@ "psr", "psr-6" ], - "time": "2016-08-06 20:24:11" + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/http-message", @@ -2063,7 +1891,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -2110,20 +1938,20 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "sensio/distribution-bundle", - "version": "v5.0.13", + "version": "v5.0.20", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281" + "reference": "4b019d4c0bd64438c42e4b6b0726085b409be8d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7bc47dcfdbde6d567e1a834577d1c04ddb970281", - "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/4b019d4c0bd64438c42e4b6b0726085b409be8d9", + "reference": "4b019d4c0bd64438c42e4b6b0726085b409be8d9", "shasum": "" }, "require": { @@ -2162,20 +1990,20 @@ "configuration", "distribution" ], - "time": "2016-10-08 18:50:33" + "time": "2017-05-11T16:21:03+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.16", + "version": "v3.0.26", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546" + "reference": "6d6cbe971554f0a2cc84965850481eb04a2a0059" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546", - "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/6d6cbe971554f0a2cc84965850481eb04a2a0059", + "reference": "6d6cbe971554f0a2cc84965850481eb04a2a0059", "shasum": "" }, "require": { @@ -2184,14 +2012,22 @@ "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { + "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "~2.4,>=2.4.5", + "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.12|~2.0", + "zendframework/zend-diactoros": "^1.3" }, "suggest": { "symfony/expression-language": "", @@ -2224,23 +2060,24 @@ "annotations", "controllers" ], - "time": "2016-03-25 17:08:27" + "time": "2017-05-11T17:01:57+00:00" }, { "name": "sensiolabs/security-checker", - "version": "v4.0.0", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c" + "reference": "9e69eddf3bc49d1ee5c7908564da3141796d4bbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/116027b57b568ed61b7b1c80eeb4f6ee9e8c599c", - "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9e69eddf3bc49d1ee5c7908564da3141796d4bbc", + "reference": "9e69eddf3bc49d1ee5c7908564da3141796d4bbc", "shasum": "" }, "require": { + "composer/ca-bundle": "^1.0", "symfony/console": "~2.7|~3.0" }, "bin": [ @@ -2268,27 +2105,28 @@ } ], "description": "A security checker for your composer.lock", - "time": "2016-09-23 18:09:57" + "time": "2017-03-31T14:50:32+00:00" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.3", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", - "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517", + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517", "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": { @@ -2321,20 +2159,20 @@ "mail", "mailer" ], - "time": "2016-07-08 11:51:25" + "time": "2017-05-01T15:54:03+00:00" }, { "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": { @@ -2381,20 +2219,20 @@ "log", "logging" ], - "time": "2016-04-13 16:21:01" + "time": "2017-01-02T19:04:26+00:00" }, { "name": "symfony/polyfill-apcu", - "version": "v1.2.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "6d58bceaeea2c2d3eb62503839b18646e161cd6b" + "reference": "2e7965b8cdfbba50d0092d3f6dca97dddec409e2" }, "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/2e7965b8cdfbba50d0092d3f6dca97dddec409e2", + "reference": "2e7965b8cdfbba50d0092d3f6dca97dddec409e2", "shasum": "" }, "require": { @@ -2403,7 +2241,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2434,25 +2272,25 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.2.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f" + "reference": "3191cbe0ce64987bd382daf6724af31c53daae01" }, "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/3191cbe0ce64987bd382daf6724af31c53daae01", + "reference": "3191cbe0ce64987bd382daf6724af31c53daae01", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/intl": "~2.3|~3.0" + "symfony/intl": "~2.3|~3.0|~4.0" }, "suggest": { "ext-intl": "For best performance" @@ -2460,7 +2298,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2492,20 +2330,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.2.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "dff51f72b0706335131b00a7f49606168c582594" + "reference": "f29dca382a6485c3cbe6379f0c61230167681937" }, "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/f29dca382a6485c3cbe6379f0c61230167681937", + "reference": "f29dca382a6485c3cbe6379f0c61230167681937", "shasum": "" }, "require": { @@ -2517,7 +2355,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2551,20 +2389,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2017-06-09T14:24:12+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.2.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a" + "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" }, "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/bc0b7d6cb36b10cfabb170a3e359944a95174929", + "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", "shasum": "" }, "require": { @@ -2574,7 +2412,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2607,20 +2445,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.2.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85" + "reference": "032fd647d5c11a9ceab8ee8747e13b5448e93874" }, "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/032fd647d5c11a9ceab8ee8747e13b5448e93874", + "reference": "032fd647d5c11a9ceab8ee8747e13b5448e93874", "shasum": "" }, "require": { @@ -2630,7 +2468,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2666,20 +2504,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2017-06-09T14:24:12+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.2.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99" + "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" }, "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/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", "shasum": "" }, "require": { @@ -2688,7 +2526,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2718,32 +2556,34 @@ "polyfill", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.11", + "version": "v2.6.2", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690" + "reference": "deabc81120c2086571f7c4484ab785c5e1b84f75" }, "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/deabc81120c2086571f7c4484ab785c5e1b84f75", + "reference": "deabc81120c2086571f7c4484ab785c5e1b84f75", "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" + "swiftmailer/swiftmailer": "~4.2|~5.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": "~3.3@dev", + "symfony/yaml": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -2751,7 +2591,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -2775,20 +2615,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2016-01-15 16:41:20" + "time": "2017-05-22T04:58:24+00:00" }, { "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": { @@ -2801,7 +2641,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", @@ -2870,6 +2710,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" @@ -2916,38 +2757,43 @@ "keywords": [ "framework" ], - "time": "2016-10-03 19:01:14" + "time": "2017-01-28T02:53:38+00:00" }, { "name": "twig/twig", - "version": "v1.26.1", + "version": "v2.4.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d" + "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a09d8ee17ac1cfea29ed60c83960ad685c6a898d", - "reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/eab7c3288ae6603d7d6f92b531626af2b162d1f2", + "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2", "shasum": "" }, "require": { - "php": ">=5.2.7" + "php": "^7.0", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { + "psr/container": "^1.0", "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~3.3@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.26-dev" + "dev-master": "2.4-dev" } }, "autoload": { "psr-0": { "Twig_": "lib/" + }, + "psr-4": { + "Twig\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2977,7 +2823,7 @@ "keywords": [ "templating" ], - "time": "2016-10-05 18:57:41" + "time": "2017-06-07T18:47:58+00:00" }, { "name": "willdurand/jsonp-callback-validator", @@ -3017,20 +2863,20 @@ } ], "description": "JSONP callback validator.", - "time": "2014-01-20 22:35:06" + "time": "2014-01-20T22:35:06+00:00" }, { "name": "willdurand/negotiation", - "version": "v2.2.1", + "version": "v2.3.1", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "1f210db45723b21edd69f39794662b8d64656b93" + "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/1f210db45723b21edd69f39794662b8d64656b93", - "reference": "1f210db45723b21edd69f39794662b8d64656b93", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", + "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", "shasum": "" }, "require": { @@ -3042,7 +2888,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -3069,39 +2915,41 @@ "header", "negotiation" ], - "time": "2016-10-14 09:17:47" + "time": "2017-05-14T17:21:12+00:00" } ], "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v3.0.11", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c" + "reference": "37f9f4e165b033fb76cc2320838321cc57140e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c", - "reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/37f9f4e165b033fb76cc2320838321cc57140e65", + "reference": "37f9f4e165b033fb76cc2320838321cc57140e65", "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/filesystem": "~2.7|~3.0", + "symfony/phpunit-bridge": "^3.3" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -3123,32 +2971,39 @@ } ], "description": "This bundle generates code for you", - "time": "2016-10-10 14:17:42" + "time": "2017-03-15T01:02:10+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v3.1.5", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9" + "reference": "acae7416018ebe5a7a2d79b4221203b2b8aca5d3" }, "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/acae7416018ebe5a7a2d79b4221203b2b8aca5d3", + "reference": "acae7416018ebe5a7a2d79b4221203b2b8aca5d3", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, "suggest": { + "ext-zip": "Zip support is required when using bin/simple-phpunit", "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.3-dev" } }, "autoload": { @@ -3178,14 +3033,12 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2016-08-19 06:48:39" + "time": "2017-06-01T14:45:22+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "kreait/firebase-php": 10 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..23e23d39d9246aef053eebd7ad124f9915a1c4ad GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwB5WY@z-9z9lrZEo6fvZF=0N2} zslgorpt$2?&|`362xf?9K#ITo<fNSZBuLU=yurZ0pz$9Jz}^Ar$Y3a8NMuN6NM=Z7 zC}t@3%t6+{;D({Yk)ePglfj9hlp&8Hg&_x&Mo@I@WME)W2V3zUYzHrc6WIK0hE%W) zoH`lRiPxD_UR(h6*NLQpoXp}91B2^~Ow25-Z0sDIoE)6I9I?R}`Q^bSi6y1QPKia) zU|wcQY7&$klAoUgXD23wWu}(L3y3)9=anR8=A{-PDUS)y%uC5Hcgio#ODP7M6OdSv zk(5{jwkTdeyt>-LNJqiQ(4baFq1xQsKu5vE*sQjegF{@^(AF~{x3a3brnYVdI5Zd- z86h+SKa_@1GZ`2d@Pt)aa8X`PeqK5xkHR#K(xV|T8UiCc1fV4f2logMhf(j3hQMeD zV1@vwd{BV48yui?1B3=iF)%VPfV%*U3=AwV-HhOV00T%4q!mPiw1Q}mRt8283v32h zD+41`D<ilY0@4TSl7MKib_PZUuyzJU2C#N`Gl&tQoq-W*Gb6Nz!U)mMzzEUKzzER} zbKWRD8Umvs01W|V2rU4r|6LgvaP|Kosz%At5Eu=CVHpC9EH1$=PT)!zyZ=CSEvP<C zfJ%dEe^7PI2&$(MV&JNn2{NE40Tl*S_aLnx8eA1KGC*qb(S`slghuJn5TJhu005)z BjCue7 literal 0 HcmV?d00001 diff --git a/src/ApiBundle/Controller/DefaultController.php b/src/ApiBundle/Controller/DefaultController.php index 89a6440..ad510ef 100644 --- a/src/ApiBundle/Controller/DefaultController.php +++ b/src/ApiBundle/Controller/DefaultController.php @@ -59,7 +59,7 @@ class DefaultController extends FOSRestController return $this->handleView($view); } catch (\Exception $e) { - $this->getLogger()->err($e->getMessage()); + $this->getLogger()->err('Error while retrieving the leagues for this sport (' . $sport . ') : ' . $e->getMessage()); $view = View::create() ->setStatusCode(400) ->setData($e->getMessage()); @@ -141,9 +141,14 @@ class DefaultController extends FOSRestController { $view = View::create(); + + // log the transaction + $this->get('logger')->warning(print_r($request->getContent(), true)); if ($request->getMethod() === 'POST') { - $content = (array)\GuzzleHttp\json_decode($request->getContent()); + $this->getLogger()->info('Trying to decode : ' . $request->getContent()); + //$content = (array)\GuzzleHttp\json_decode($request->getContent()); + $content = json_decode($request->getContent(), true); $deviceRepository = $this->getDeviceRepository(); if ($device = $deviceRepository->findOneBy(['uuid' => $content['uuid']])) { $deviceRepository->updateInfo($content,$device); @@ -168,8 +173,12 @@ class DefaultController extends FOSRestController public function savePurchaseAction(Request $request) { $view = View::create(); + + // log the transaction + $this->get('logger')->warning(print_r($request->getContent(), true)); if ($request->getMethod() === 'POST') { + $this->getLogger()->info('Trying to decode : ' . $request->getContent()); $content = (array)\GuzzleHttp\json_decode($request->getContent()); $deviceRepository = $this->getDeviceRepository(); $device = $deviceRepository->findOneBy(['uuid' => $content['uuid']]); @@ -178,7 +187,7 @@ class DefaultController extends FOSRestController $notificationRepository->savePurchase($device, $content['transactionId'], $content['leagues']); } catch (\Exception $e) { $view->setStatusCode(400); - $this->getLogger()->err($e->getMessage()); + $this->getLogger()->err('Error saving the transaction : ' . $e->getMessage()); } return $this->handleView($view); diff --git a/src/BackendBundle/.DS_Store b/src/BackendBundle/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8fcb0c0c5bfb04464a77d6b7c78a92deb5952232 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwA|QQ?U^7w~@)%MWoES<O@}P2~ z)MyBdhQQzr0Z`r*WN>0gWJqSnW<burDGWIbsSJ7y1q>Ms1)e$i$w@i+NzkIgnt_2q z<3AXHy~f4h%#hEJ$56sh#E{RB1J+rDre`HFdXmbE3!wI#NGiz5EG{uHxX#GL%)-jX z&cVsa!O6=J8=R3}9$b=GQd;bkSQHKBWu~MiLD?bs`8jZQVp3RUYI(eXh;x2kNn&PR zY7vt1nDETJl>Bn1{L;LXVz4;@i6t3HiA7+G;swO3t1XOl6pRcFYIPK<&CLyT6ikfG zYHK+-#8nM#Jri;(tEy{i>t=vMfPs+_LNo9~X&5z=fq?;Q_>=_~<>ln(rGrXi1_lN; z23K$hW-^p8RHB9*qc~dFu`swX<TDg8<f5r-MN`Mc5X6wmP{5GSP|N@_7o-Q>?9asL z8Mg6)C4A80g%ccx#SHljr3^(3$qcCs#i*gq0Ll$Bz?tDcEYgPr4Nb8e+(W{(qmCR6 zfzc44X9$4G2L)*D<N&1`AT&sdfsug$+y!7{U|@l{3(^l@0Lg*0f@qLd5Dn7GzzAZ2 z%>Zj<V1#OA1b0I~`aoS05DnJOz{mjB&cMh3)()>`86nyk7@;;ZLVGBT5bX?%5bX?% z5bZGMjnbnbFd72T5MYMT0-*Zem4N|Q{~w}ilpGC#(GVDxA;8Gu671pxu9UI+4^-EJ z>eB?MG^q9mRmY5=dK#h+qy#L>1Q}420COO6Ag!QkA6ykPGC*qb(S`slghuJn5TJhu F000`s?Cbyl literal 0 HcmV?d00001 diff --git a/src/BackendBundle/Controller/.NotificationController.php.swo b/src/BackendBundle/Controller/.NotificationController.php.swo new file mode 100644 index 0000000000000000000000000000000000000000..597c12dcce746433ba78286d43a5c42e3074b88e GIT binary patch literal 16384 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 ZO!N80R6^58LvVf(It2k5Vt`IC0strXT$TU; literal 0 HcmV?d00001 diff --git a/src/BackendBundle/Controller/.NotificationController.php.swp b/src/BackendBundle/Controller/.NotificationController.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..98e7f1e6364733f428371458087e370a660f27e8 GIT binary patch literal 20480 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 ToB?0^S*(y)tN=9yyxa)@ddKMA literal 0 HcmV?d00001 diff --git a/src/BackendBundle/Controller/EntityBrowserController.php b/src/BackendBundle/Controller/EntityBrowserController.php index 6d6cec3..3547e14 100644 --- a/src/BackendBundle/Controller/EntityBrowserController.php +++ b/src/BackendBundle/Controller/EntityBrowserController.php @@ -13,7 +13,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; class EntityBrowserController extends Controller { - const DEFAULT_PAGE_RESULT = 20; + const DEFAULT_PAGE_RESULT = 2000000; /** * @param string $name diff --git a/src/BackendBundle/Controller/NotificationController.php b/src/BackendBundle/Controller/NotificationController.php index 45862f2..b9a8ad9 100644 --- a/src/BackendBundle/Controller/NotificationController.php +++ b/src/BackendBundle/Controller/NotificationController.php @@ -24,7 +24,7 @@ class NotificationController extends Controller const NOTIFICATION_API_URL = 'https://fcm.googleapis.com/fcm/send'; const SERVER_KEY = "AAAA6m6eLXI:APA91bHDsojOIQaWHX5nGNGS9Thyn6MAZZvLvvfEEdWmzbOjD7lYqkghcER69wRkiaRb4zfEQ5P5V8ckdVjGUf58CmMqYNhsRPCy75OeugN85oHCOCBvYn7I7czIsy2pScYKgB2eWC0wRxsyw7-iEMwpzf6eZFWM8w"; const SENDER_ID = "1006878207346"; - const DEFAULT_PAGE_RESULT = 20; + const DEFAULT_PAGE_RESULT = 200000000; /** * @param Request $request @@ -45,10 +45,12 @@ class NotificationController extends Controller if ($form->isValid()) { $devices = $this->getDoctrine()->getRepository('BackendBundle:Device')->findAll(); - + + $client = new Client(); + - foreach ($devices as $device) { + /*foreach ($devices as $device) { if ($device->getLocale() === 'fr') { $message = [ 'notification' => [ @@ -82,11 +84,52 @@ class NotificationController extends Controller ] ]); } - } + }*/ + + $messageFR = [ + 'notification' => [ + 'title' => $notification->getFrenchTitle(), + 'body' => $notification->getFrenchContent(), + "content_available" => 1 + ], + //'to' => $device->getToken(), + 'to' => '/topics/fr', + 'priority' => 'high' + ]; + + $messageEN = [ + 'notification' => [ + 'title' => $notification->getEnglishTitle(), + 'body' => $notification->getEnglishContent(), + "content_available" => 1 + ], + //'to' => $device->getToken(), + 'to' => '/topics/en', + 'priority' => 'high' + ]; + + $client->request('POST', self::NOTIFICATION_API_URL, [ + 'body' => json_encode($messageFR), + 'headers'=> [ + 'Authorization' => 'key='.self::SERVER_KEY, + 'Content-Type' => 'application/json', + ], + 'verify' => false, + ]); + + $client->request('POST', self::NOTIFICATION_API_URL, [ + 'body' => json_encode($messageEN), + 'headers'=> [ + 'Authorization' => 'key='.self::SERVER_KEY, + 'Content-Type' => 'application/json', + ], + 'verify' => false, + ]); $notification->setDate(new \DateTime()); $em = $this->getDoctrine()->getEntityManager(); $em->persist($notification); + $em->flush(); $this->getDoctrine()->getRepository('BackendBundle:NotificationOnDevice')->updateStatusOnAllDevices($devices, $notification); $this->addFlash('success', 'La notification a bien été envoyée'); return $this->redirectToRoute('backend_notification_list', ['page' => 1]); diff --git a/src/BackendBundle/Controller/NotificationController.php~ b/src/BackendBundle/Controller/NotificationController.php~ new file mode 100644 index 0000000..453fb0f --- /dev/null +++ b/src/BackendBundle/Controller/NotificationController.php~ @@ -0,0 +1,135 @@ +<?php +/** + * Created by PhpStorm. + * User: jeremyguiselin + * Date: 23/09/2016 + * Time: 08:22 + */ + +namespace BackendBundle\Controller; + +use BackendBundle\Entity\Notification; +use Doctrine\ORM\Tools\Pagination\Paginator; +use GuzzleHttp\Client; +use GuzzleHttp\Exception\BadResponseException; +use GuzzleHttp\Exception\ClientException; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; + +class NotificationController extends Controller +{ + + const NOTIFICATION_API_URL = 'https://fcm.googleapis.com/fcm/send'; + const SERVER_KEY = "AIzaSyCFdGq-rjzznFOEzDifZGsRoeWT8LFAc9s"; + const SENDER_ID = "1006878207346"; + const DEFAULT_PAGE_RESULT = 20; + + /** + * @param Request $request + * @return Response + * + * @Route("/admin/notification/create") + */ + public function createAction(Request $request) + { + + $notification = new Notification(); + + $form = $this->createForm('BackendBundle\\Form\\NotificationType', $notification); + + if ($request->getMethod() === Request::METHOD_POST) { + $form->handleRequest($request); + + if ($form->isValid()) { + + $devices = $this->getDoctrine()->getRepository('BackendBundle:Device')->findAll(); + + $client = new Client(); + + foreach ($devices as $device) { + if ($device->getLocale() === 'fr') { + $message = [ + 'notification' => [ + 'title' => $notification->getFrenchTitle(), + 'body' => $notification->getFrenchContent() + ], + 'to' => $device->getToken() + ]; + } else { + $message = [ + 'notification' => [ + 'title' => $notification->getEnglishTitle(), + 'body' => $notification->getEnglishContent() + ], + 'to' => $device->getToken() + ]; + } + + $client->request('POST', self::NOTIFICATION_API_URL, [ + 'body' => json_encode($message), + 'headers'=> [ + 'Authorization' => 'key='.self::SERVER_KEY, + 'Content-Type' => 'application/json', + ] + ]); + } + + $notification->setDate(new \DateTime()); + $em = $this->getDoctrine()->getEntityManager(); + $em->persist($notification); + $this->getDoctrine()->getRepository('BackendBundle:NotificationOnDevice')->updateStatusOnAllDevices($devices, $notification); + $this->addFlash('success', 'La notification a bien été envoyée'); + return $this->redirectToRoute('backend_notification_list', ['page' => 1]); + } + } + + return $this->render('@Backend/notification/create.html.twig',[ + 'form' => $form->createView() + ]); + } + + /** + * @param Request $request + * @param int $page + * @return Response + * + * @Route("/admin/notification/list/{page}") + */ + public function listAction(Request $request, int $page) + { + $em = $this->getDoctrine()->getManager(); + + if (!isset($page)) { + $page = 1; + } + + $repository = $em->getRepository('BackendBundle:Notification'); + + $query = $repository->getAll(); + + $firstResult = $page === 1 ? 0 : self::DEFAULT_PAGE_RESULT * ($page-1) - 1; + + $pagination = new Paginator($query); + + $totalItems = count($pagination); + + $pagesCount = ceil($totalItems / self::DEFAULT_PAGE_RESULT) >= 1 ? ceil($totalItems / self::DEFAULT_PAGE_RESULT) : 1; + + $pagination->getQuery() + ->setMaxResults(self::DEFAULT_PAGE_RESULT) + ->setFirstResult($firstResult) + ; + + return $this->render( + 'BackendBundle:notification:list.html.twig', + [ + 'elements' => $pagination, + 'countPages' => $pagesCount, + 'page' => $page + ] + ); + } + +} \ No newline at end of file diff --git a/src/BackendBundle/Entity/League.php b/src/BackendBundle/Entity/League.php index d9204cf..5a169f2 100644 --- a/src/BackendBundle/Entity/League.php +++ b/src/BackendBundle/Entity/League.php @@ -164,6 +164,7 @@ class League */ public function getPredictionsNumber() { + return 999; return $this->predictionsNumber; } @@ -264,4 +265,9 @@ class League { return $this->englishDescription; } + + public function __toString() + { + return $this->getName() . ' - ' . $this->getFrenchDescription() ; + } } diff --git a/src/BackendBundle/Entity/Transaction.php b/src/BackendBundle/Entity/Transaction.php index 5ec215f..7bb95fe 100644 --- a/src/BackendBundle/Entity/Transaction.php +++ b/src/BackendBundle/Entity/Transaction.php @@ -24,7 +24,7 @@ class Transaction /** * @var string * - * @ORM\Column(name="store_transaction_id", type="string", length=255, unique=true) + * @ORM\Column(name="store_transaction_id", type="string", length=255) */ private $storeTransactionId; diff --git a/src/BackendBundle/Form/PredictionType.php b/src/BackendBundle/Form/PredictionType.php index 5a3fe1a..4337bd6 100644 --- a/src/BackendBundle/Form/PredictionType.php +++ b/src/BackendBundle/Form/PredictionType.php @@ -27,8 +27,7 @@ class PredictionType extends AbstractType ]) ->add('league', EntityType::class, [ 'label' => 'Ligue', - 'class' => 'BackendBundle\Entity\League', - 'choice_label' => 'name' + 'class' => 'BackendBundle\Entity\League' ]) ->add('date', DateTimeType::class, [ 'format' => "yyyy-MM-dd HH:mm", diff --git a/src/BackendBundle/Repository/DeviceRepository.php b/src/BackendBundle/Repository/DeviceRepository.php index a3e04b4..52a27ff 100644 --- a/src/BackendBundle/Repository/DeviceRepository.php +++ b/src/BackendBundle/Repository/DeviceRepository.php @@ -55,8 +55,12 @@ class DeviceRepository extends EntityRepository $device ->setModel($data['model']) - ->setPlatform($data['platform']) - ->setToken($data['token']) + ->setPlatform($data['platform']); + if ($device->getToken() === 'tokenCannotBeCreated' || !$device->getToken()) { + $device->setToken($data['token']); + } + + $device ->setLocale($data['locale']) ->setVersion($data['version']); } diff --git a/src/BackendBundle/Repository/LeagueRepository.php b/src/BackendBundle/Repository/LeagueRepository.php index db7961c..c75231d 100644 --- a/src/BackendBundle/Repository/LeagueRepository.php +++ b/src/BackendBundle/Repository/LeagueRepository.php @@ -33,9 +33,10 @@ class LeagueRepository extends EntityRepository $qb = $this->getEntityManager()->getRepository('BackendBundle:Prediction')->createQueryBuilder('p'); $qb - ->select('count(p.id) AS predictions, l.name AS name, min(p.date) as minDate, max(p.date) as maxDate') + ->select('count(p.id) AS predictions, l.id AS leagueId, l.name AS name, min(p.date) as minDate, max(p.date) as maxDate') ->join('p.league', 'l', Join::WITH, 'p.league = l') ->where('l in (:leagues)') + ->andWhere('p.score IS NULL') ->setParameter('leagues', $leagues) ->groupBy('l'); @@ -43,7 +44,7 @@ class LeagueRepository extends EntityRepository $qb = $this->getEntityManager()->getRepository('BackendBundle:LeagueOnDevice')->createQueryBuilder('ld'); $qb - ->select('ld.status AS status, l.name AS name') + ->select('ld.status AS status, l.id AS leagueId, l.name AS name') ->join('ld.league', 'l', Join::WITH, 'ld.league = l') ->where('l in (:leagues)') ->setParameter('leagues', $leagues) @@ -56,7 +57,7 @@ class LeagueRepository extends EntityRepository $predictions = []; foreach ($leagueResult as $r) { - $predictions[$r['name']] = [ + $predictions[$r['leagueId']] = [ 'number' => (int) $r['predictions'], 'min_date' => $r['minDate'], 'max_date' => $r['maxDate'] @@ -64,18 +65,21 @@ class LeagueRepository extends EntityRepository } foreach ($leagueOnDeviceResult as $r) { - $predictions[$r['name']]['status'] = $r['status']; + $predictions[$r['leagueId']]['status'] = $r['status']; } foreach ($leagues as $league) { - if (isset ($predictions[$league->getName()])) { - $prediction = $predictions[$league->getName()]; + if (isset ($predictions[$league->getId()])) { + $prediction = $predictions[$league->getId()]; $league->setPredictionsNumber($prediction['number']); $league->setMinDate($prediction['min_date']); $league->setMaxDate($prediction['max_date']); $league->setDeviceStatus($prediction['status']); } else { $league->setPredictionsNumber(0); + $league->setMinDate(''); + $league->setMaxDate(''); + $league->setDeviceStatus('lock'); } } diff --git a/src/BackendBundle/Resources/views/notification/list.html.twig b/src/BackendBundle/Resources/views/notification/list.html.twig index 3006af0..9cc1900 100644 --- a/src/BackendBundle/Resources/views/notification/list.html.twig +++ b/src/BackendBundle/Resources/views/notification/list.html.twig @@ -5,7 +5,15 @@ {% block subcontent %} <div class="row"> <div class="col-sm-12 table-container"> - {% include '@Backend/entity-browser/buttons.html.twig' %} + <div> + <div class="left"> + <a href="{{ path('backend_notification_create') }}" class="btn btn-lg btn-raised btn-success">Ajouter une nouvelle notification</a> + </div> + <div class="right"> + <a onclick="selectAll(this)" id="selectAll" class="btn btn-lg btn-raised btn-info">Selectionner tout</a> + <a onclick="deleteElements()" id="deleteButton" class="btn btn-lg btn-raised btn-danger">Supprimer</a> + </div> + </div> <table class="table table-striped" cellspacing="0" width="50%"> <thead> <tr> @@ -57,4 +65,4 @@ var section = 'notification'; </script> <script src="{{ asset('js/ajax-select-and-delete.js') }}"></script> -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/BackendBundle/Resources/views/prediction/list.html.twig b/src/BackendBundle/Resources/views/prediction/list.html.twig index 5dec475..7ced638 100644 --- a/src/BackendBundle/Resources/views/prediction/list.html.twig +++ b/src/BackendBundle/Resources/views/prediction/list.html.twig @@ -30,7 +30,7 @@ <td>{{ element.firstTeam.name }}</td> <td>{{ element.secondTeam.name }}</td> <td>{{ element.date | date('d-m-Y H:i') }}</td> - <td>{{ element.league.name }}</td> + <td>{{ element.league }}</td> <td>{{ element.predictionWinFirst }} %</td> <td>{{ element.predictionWinSecond }} %</td> <td>{{ element.predictionDraw }} %</td> @@ -63,4 +63,4 @@ var section = 'prediction'; </script> <script src="{{ asset('js/ajax-select-and-delete.js') }}"></script> -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/tests/.DS_Store b/tests/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..38ac55c817ae7ff7cb4d59a56d48fb333cec3b16 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwA|Odduo=M&B@FotMGUE)IZ(M# zYBU5!LtyZR04VQrGUze5Fa$HiGa%*P{N$vZ{3J-xz<7g!fkERx7=XRP$>7LPz>vw{ z#8AqR$B@F11IqEpIvCtQIv5xjnEwCAr6Z}lxBzO$kEDW}%;FLQgPV*@%q*;I>>Qk2 z++5t;+ya7JvB4Sn<-sM1C8fnqiAB+1US>*a5|kZ~Sdsx_hvetyz}bmOVVSAr@d6^w z`FSOYnR%&2NLpjUGxJjN%boH|^HPdqf+6OGXQq^7#0!W96s4ABrj`dJ=B0*Z7H1}9 z=46&sa&U5Ra&pECh*wt|T3F~P7@ODXC{&wUnCU2(T3XiD3M}H_kk&MH^o=a2?OL>W z$<k%ZR~$M5_B#V3BZOuUhSD(VC<6lnmar@fF3QWv&r1iD({L39ctZOOG_)B}LK{WL zXlOGaLK`Jy&_bJ+!HFS}A(<hYAr+jqai(#`AW*1-GX*4#!(w%)(9l%L!97$QJnGKT z5Eu;sx`hC!d{BVaK@L#50YZbM7#JBCz+C`F1_l<GqaghN29O*`D~JYZ1<@d_42&Qa z*bJ~%21ck>MsPO-qz}|30nuRX42%q5?F@_zVD0d#lo6txfe~smBd8$*G8dwqff1se zff1q|=DbmQGz3ON02%_!5Ly6K|GP3U;OhTFRE?6OAut*O!!iUISzLl$oIsT)4)1~L zT2OtO0F?*T{-ElZ5mZk@^nsLsWtkuYiV|QBL=L1CRPBSSVnzl?O+MNXfQ8T~JsJY^ G4*>ve((T9q literal 0 HcmV?d00001 diff --git a/tests/ApiBundle/.DS_Store b/tests/ApiBundle/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2a63f8c15457165e54464946b4b200326765aadf GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwBFrH3z-AON<TK<j<S?W%6hY-i zslgorpt$2=aAwG7$YUsBK#D)loc!dZocttc;&5YNV9)@?^Z)-~4`J1lR9;*F)$=2% zASbi9#K7PtBNH<VD;qlpCl@ytH#fI{AXjW~Mt*s4Nn%N9u~TAEG?<r}l9~i%2PBqc zz}O-A`8jZQVp3RUYI(eXh;x2kNn&PRY7vswnDETJl>Bn1{L;LX;+SBFdEuEUB^mJo zq5(yzWtpkv0f~93VVT95NtrpBC6yeU9Gsk-@dD!2)rJ-pIts?-wK@vb<`!l;3Z|Bp zwY36^I5?y=O&xtB3u?O-Enc#8+42>Kj(~m7z{m)p8HAxUj5^A|z<@Pu%7TmXa`N-i zL173}JW7v-z-S1JhQI)Y0JIF_;2t3RN39(Vfzc2cydeN89~7YN6$dEY0HHxr42%p6 z;4T0o0|N`p7mVP300T%4q!mPiw1Q}mRt8283v32hD+41`D<ilY0@4TSl7MKib_PZU zuyzJU2C#N`!;2B3oq-W*Gb6Nz!U)mMzzEUKzzER}bKWRD8Umvs01W|9-w)Ki1J(bo z3=FvX|4`MV)MyBdhQM$P0Y(;=U>7HFrHtKspt=@RpC&-1LA5`qI%Wjb(+DweRm=n# iP?UfQgQ|OwRuB!YiWwOoHTh^m02V@{^k@jsKLh~n5^(DP literal 0 HcmV?d00001 diff --git a/tests/ApiBundle/Controller/.DS_Store b/tests/ApiBundle/Controller/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c01a3dc60792bfeec18cb28e06f8fca0f475cbf0 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8z4DAe90Z1N%F(jFwB8(vOz-E*(<S>*lI5Xrk<U!>K zQ6RmN3@!|*3~3CB49NOR7>XG38FCnM7*ZLE7(y6Q8HyQ781xtl7%~_NJah7slXCKt zpiXyVU|`Syx#ItSLKcq7kA}c#2#kinXb6mkzz7ckP~8iv|G7taIE;FKGz3ON05b$Y z<%0sKRn5S_-~go?AT&sdfsug$+y!7{U|@miW(4;G7(j9$tsokt6-0xyGBAQzU^Bp4 z85p5j8NuBUkUmhC1Vn?iGcbZ}2Jyk#85qGfGcYhhv@<Y5ZDxe_P#7WF85kkj85qH~ z!(2B?kA}c#2*5&s8Nv_%)&H&x47mFL5LKh(Xb6mkz_1JfMi!S~7bkF~jNN~rx)xNQ zCLl>Og6d?59*{JsS_fCfOppOZ37Aqw1_qE;kUY35W@KOh*W{xO0ayr)(xV|j{}2EG D2@M?o literal 0 HcmV?d00001 diff --git a/tests/AppBundle/.DS_Store b/tests/AppBundle/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ec1750422a7775a3b365b4caeeb888f70693741f GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zOq>i@0Z1N%F(jFwA}k>Dz-9z9lrZEo6fvZF=0N2} zslgorpt$2?&|`362xf?9K#ITo<fNSZBxuq&!@$6x@gEGp-r-_!X2@sAV<=%LV#sI6 zVaQ=fWhnB@LDAy|(gR8v|NrCGlT=<@0JY~wQbA5;afyM!O-3eW7FITP4o)s^E^cma z0YR?V;Eeq8;F83W(qgB?qG&KLGbJ?%$__{@$$+s#^7C`x?8Kz7%+&ID0TJi?ypqJs zywoBjtuf)5c`5njPWh#IDaA3t5c9$_Q%W-81w;diQp++^%L5YgQo}NfGm|oNGD|8s zI5{{uIpYPytE&wyEOZo%&1-cOs?9CTbQDZ2Eo*B97IAP$YnnRxMi$g|En2)}>9XZ3 z4jlpeo`I1OLNf?MX&7~sfq?;Qc$Nhh<>ln(rGvr{rg)Sd4S~@R7!3icgaEWe;^3x= zX`_aWhQMeD45ttPl@AKg)`tU>Zh+7rDF#Lc25=XEk%0l!j0Ag~5!?@80Lg*0f@qLd z5Dn7GzzAZ2%>Zj<V1#OA1b0I~`aoS05DnJOz{mjB&cMh3)(&q*F+#L6FhXr+g!WJv zA=()jA=()jA=<%i8zn|VU^D~}A;1h_3V`Z=R|W=L{eOt6QF1f{Mnhm&h5#drOR$R* zxKhUMKTur@s!tQ3(xBQOR2?&d>S=@+xGH9X3@A!Kg+bLlNGpg2SH+ABkeYn7Api@Z LQF=54=pO<AI|F`w literal 0 HcmV?d00001 diff --git a/tests/AppBundle/Controller/.DS_Store b/tests/AppBundle/Controller/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..87d12a1ff093583b024775c9786915c6a29d0e65 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zj35RBCIAV8Fop~hR0Kpbg3SnKC}GHFC}K$U%z?@c zb_(QnP6j;&7lvSlcm^c*=O-uS<R?Lc<_rS^gT{X_0DDN1!G$4}A&nuCp_Czqp@hMi zA)g_Sp@gA`A)g_KA%`KAp@<=bA(f$+p@cz?p@1QSp};c-#Y8tW6T!xg5~Cq78Umvs zFd71*AwY)^V1(Gg!408D$<YuP4S~@RfQJC6d{6-O6&M&89H4Xqga%15FfuTJn$IAb z1*Qqo4`2X^fwY2XkX8^4(#pUHVu8&7Yh_?$fM{g|cSAt>KwT0L4c5-U2(}r-2Ww|w z1l!EOzzEUKzzEUK0PDOkLbNk5LbNk5f^CPnZj>Gkfzc3vg#a^zApolXT^Zn62qHR4 zj)uT!2#kmjU}SL#c5wn%%Gmu2s%t^@X#!LlR0l(<V^GD6+6Z8R3@A!Km4d2!kX8^4 Yu8J8M7{FRb8v?Kp8l^`=fc_x>0D71%DgXcg literal 0 HcmV?d00001 diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 7e7723a..3b14a40 100755 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -633,12 +633,6 @@ class SymfonyRequirements extends RequirementCollection 'Install and enable the <strong>mbstring</strong> extension.' ); - $this->addRecommendation( - function_exists('iconv'), - 'iconv() should be available', - 'Install and enable the <strong>iconv</strong> extension.' - ); - $this->addRecommendation( function_exists('utf8_decode'), 'utf8_decode() should be available', @@ -780,7 +774,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/.DS_Store b/web/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8c022fe1600c4c62f8230c085d9dcc2353d7aeb7 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwBD^5;z-9z9lrZEo6fvZF=0N2} zsnHM^4S~TM0-(Ih$)LyJ!Vt_5&w!MF^OKWu@{=G%17i>a10%<OFaUc6q$7i&gdve3 znIV}Wm7$oS*fR%N2ZI{}1A_)w!+)?2c7{ZT0)_$xJ%$2?42A+!)gbdxRC7aB$1|ib zq%xFY*TrxK%?=T$t{jF`23>GTRLYRdkinqKkjaqDkk60@HYblE9nJO|Xy$N1Ri`mz zGNgm`V7M6UzZsx%??1$U%nZp`LILDLkSZorRY~Q=1<=s_kyMbASzKaZaFdaVnT3^& zor9B$n~R&9TR@O2HaH`{Jh&vWq_o&6u_zkM%S=g4g0ce=OEO^Wko^1{I6E;ZEHkw{ zUO>b-Kd&S)GcUCWNo!1aW?o8uxl?{=UP^IHFvPs@%#@OhcmdIXqSUg?)bfDDywtGF z;>@JXoXnC+4o(hEPR@7%@#<<rGfN!>6XRMPg=%vPGaUs}OUv3?fkhk~(we4@zL5pB zU5gekS-NcbibF@hvChEA2%#B-p)`y-%D}(?4YRV~qP(2^ymU}#GB7Z3Go&#jGL#|3 z894UP;w*@Pfnf$x`eJ2B1IKU)dP-yj#V)c+CWb6@HK5o;N#9%yMGW~2NeuZ6B@D$3 zdJH8D6$~Y)E&!!I6g@DX4ILU9HyqqU$H}8E9Swoe5TH{CfXW92XsPS~r5hkLNQ!}x zfdSkFU}RumfjNm0+z(&?$$_+jXpmMA4bsZM2x5WF0BdDnglc63cSAt>KwT0L4c5-U z$N<*Pz{mjB4zExcA=()jp*Ax@dnk+$?F@_%?F@_%?J(z!(xV|T8UoM|V202Fp!(mH zfdN<lAEIiM91Vfd5Ezyrz{uhf?BWEjl(G8{RM&#)(*&qAsP+d{$BdwQ8ln%R1T4!0 k8Bmk}b0Bgct)OZjTop4iKx*>Qh5#&tM(NQIpnnJe0Fm(SDgXcg literal 0 HcmV?d00001 diff --git a/web/config.php b/web/config.php index a031a3a..fd7e17e 100644 --- a/web/config.php +++ b/web/config.php @@ -11,7 +11,7 @@ */ if (!isset($_SERVER['HTTP_HOST'])) { - exit('This script cannot be run from the CLI. Run it from a browser.'); + exit("This script cannot be run from the CLI. Run it from a browser.\n"); } if (!in_array(@$_SERVER['REMOTE_ADDR'], array( @@ -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 { diff --git a/web/css/.DS_Store b/web/css/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7201845fb2c0f3cf73ae889321e09df802a9778f GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwBAg)ez-9z9lrZEo6fvZF=0N2} zsnHM^4S~TM0-(Ih$)LyJ!Vt_5&w!MF^OKWu@{^!NgBt?_BgcO*0DDD+A&DWMA)ld` zp@gA`A(5egL6;$yA(5ekA(f$sA(J7IA%{ViAq6T@!jQ?3%aF=Yz>vw1%#aOMqsNfU zP|Q&5nS*W*g9g}||6qF*q4tyzv?-OLm?4uPogt4wk0F;K6HH^X;S2)<iVdoi+W@vP zk)Z(9FN{HGHVH7KG2}DkF_bXqG9)sTGk{#24-OZsVZnF<O}_{p{rG(B#=yWZ11U`T z!7)_8P{5D_b_3z?Le?#eUpJnxKsJRF9G{h77vT0ivJP-^7$vA00*nyTIJhD7C^;Ge zqaiRF0`L$3l@AJ#wmpLblx~2~ASnh$1_p2!fRTZL1*VA++z(&?$$_+jXpmMA4bsZM z2x5WF0BdDnglc63cSAt>KwT0L4c5-U2(}r-2Ww|w1l!EOzzEUKzzDUO5!ypxglK1A zglK1A1ltaC-6%a80;3@S3jt;bLjY9&yD~7~>i<Jjjgq4wFd72GG6Wb|T!LMkz?Cv~ z|AFdSP<@&Jl?K(ppz4?rR4+sHfs}w{nIHp-5?~HQ4x|-S?SrdgMg|6u*3pIlEPzJo K(GVDb5C8ziPqZ8W literal 0 HcmV?d00001 -- GitLab