From 82012628d1e6adc0294e5780faac203706ba9987 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 1 May 2019 20:51:41 +0200 Subject: [PATCH 1/2] Upgrade deps Signed-off-by: Thomas Citharel --- composer.lock | 59 +++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 7246719..76b6a75 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "19065bd58afc6d6db9a7690560835814", + "content-hash": "a209fcdeca22925bfbe08b4571adb0fa", "packages": [ { "name": "doctrine/annotations", @@ -970,7 +970,7 @@ }, { "name": "symfony/console", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -1042,7 +1042,7 @@ }, { "name": "symfony/debug", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -1215,16 +1215,16 @@ }, { "name": "symfony/translation", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "aae26f143da71adc8707eb489f1dc86aef7d376b" + "reference": "301a5d627220a1c4ee522813b0028653af6c4f54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/aae26f143da71adc8707eb489f1dc86aef7d376b", - "reference": "aae26f143da71adc8707eb489f1dc86aef7d376b", + "url": "https://api.github.com/repos/symfony/translation/zipball/301a5d627220a1c4ee522813b0028653af6c4f54", + "reference": "301a5d627220a1c4ee522813b0028653af6c4f54", "shasum": "" }, "require": { @@ -1281,11 +1281,11 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-04-10T16:00:48+00:00" + "time": "2019-05-01T11:10:09+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -2449,12 +2449,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "9c6c45a2bf8825209fc18861ff666a90f4d878cf" + "reference": "1dfa887a7e87ba9b7c635299462554b9ad241d5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9c6c45a2bf8825209fc18861ff666a90f4d878cf", - "reference": "9c6c45a2bf8825209fc18861ff666a90f4d878cf", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1dfa887a7e87ba9b7c635299462554b9ad241d5b", + "reference": "1dfa887a7e87ba9b7c635299462554b9ad241d5b", "shasum": "" }, "conflict": { @@ -2468,14 +2468,14 @@ "aws/aws-sdk-php": ">=3,<3.2.1", "brightlocal/phpwhois": "<=4.2.5", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", - "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4|>=3.4,<3.4.14|>=3.5,<3.5.17|>=3.6,<3.6.4", + "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", "codeigniter/framework": "<=3.0.6", "composer/composer": "<=1.0.0-alpha11", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=4,<4.4.37|>=4.5,<4.7.3", + "contao/core-bundle": ">=4,<4.4.39|>=4.5,<4.7.5", "contao/listing-bundle": ">=4,<4.4.8", "contao/newsletter-bundle": ">=4,<4.1", "david-garcia/phpwhois": "<=4.3.1", @@ -2553,7 +2553,7 @@ "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", - "simplesamlphp/simplesamlphp": "<1.16.3", + "simplesamlphp/simplesamlphp": "<1.15.2|>=1.16,<1.16.3", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "slim/slim": "<2.6", "smarty/smarty": "<3.1.33", @@ -2564,23 +2564,26 @@ "swiftmailer/swiftmailer": ">=4,<5.4.5", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/sylius": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", - "symfony/dependency-injection": ">=2,<2.0.17", + "symfony/cache": ">=3.2,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", - "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2", - "symfony/http-foundation": ">=2,<2.7.49|>=2.8,<2.8.44|>=3,<3.3.18|>=3.4,<3.4.14|>=4,<4.0.14|>=4.1,<4.1.3", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/http-foundation": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/polyfill": ">=1,<1.10", "symfony/polyfill-php55": ">=1,<1.10", + "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.19|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", + "symfony/security": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", + "symfony/symfony": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", @@ -2646,7 +2649,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-04-18T06:59:35+00:00" + "time": "2019-04-30T09:56:45+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -3163,7 +3166,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -3226,7 +3229,7 @@ }, { "name": "symfony/filesystem", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -3276,7 +3279,7 @@ }, { "name": "symfony/finder", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3325,7 +3328,7 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -3493,7 +3496,7 @@ }, { "name": "symfony/process", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -3542,7 +3545,7 @@ }, { "name": "symfony/stopwatch", - "version": "v3.4.26", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", From 082644a021ab3c5046b06f570251381c07e9e3b2 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 1 May 2019 20:51:55 +0200 Subject: [PATCH 2/2] Version 1.2.0-alpha.1 Signed-off-by: Thomas Citharel --- app/inc/constants.php | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/inc/constants.php b/app/inc/constants.php index 92f2b5e..a0f0e02 100644 --- a/app/inc/constants.php +++ b/app/inc/constants.php @@ -18,7 +18,7 @@ */ // FRAMADATE version -const VERSION = '1.2.0'; +const VERSION = '1.2.0-alpha.1'; // PHP Needed version const PHP_NEEDED_VERSION = '5.6'; diff --git a/composer.json b/composer.json index e4899d7..8445332 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Application to facilitate the schedule of events or classic polls", "homepage": "https://framadate.org/", "keywords": ["poll", "framadate"], - "version": "0.9.0", + "version": "1.2.0-alpha.1", "license": "CECILL-B", "type": "project",