From 31e33fc42e76bad4aca448f13f3f6fc7fd1f0641 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 14 Jan 2016 18:23:03 +0100 Subject: [PATCH] Update to Symfony 3.0.x --- composer.json | 11 ++- composer.lock | 269 +++++--------------------------------------------- 2 files changed, 31 insertions(+), 249 deletions(-) diff --git a/composer.json b/composer.json index 46630f770..78b32307a 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=5.5.0", - "symfony/symfony": "~2.8", + "php": ">=5.5.9", + "symfony/symfony": "3.0.*", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-cache-bundle": "^1.2", @@ -66,9 +66,9 @@ }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", - "sensio/generator-bundle": "~3.0", + "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~4.4", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "^2.7" }, "scripts": { "build-parameters": [ @@ -91,7 +91,10 @@ }, "extra": { "symfony-app-dir": "app", + "symfony-bin-dir": "bin", + "symfony-var-dir": "var", "symfony-web-dir": "web", + "symfony-tests-dir": "tests", "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml", diff --git a/composer.lock b/composer.lock index 3740d4ef0..13eac03fd 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": "786f108cf7727020aa2f003dccd9a58e", - "content-hash": "d8c2f517c9cd9d9ec767a0b396a11de7", + "hash": "084bbfd3166c16fd6bb6feb2c954a9da", + "content-hash": "9352d3c7f307a23d5fec42c350ea0653", "packages": [ { "name": "behat/transliterator", @@ -2670,48 +2670,6 @@ ], "time": "2015-11-10 17:04:01" }, - { - "name": "ircmaxell/password-compat", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "4.*" - }, - "type": "library", - "autoload": { - "files": [ - "lib/password.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", - "homepage": "http://blog.ircmaxell.com" - } - ], - "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", - "homepage": "https://github.com/ircmaxell/password_compat", - "keywords": [ - "hashing", - "password" - ], - "time": "2014-11-20 16:49:30" - }, { "name": "j0k3r/graby", "version": "1.0.8", @@ -4572,22 +4530,22 @@ }, { "name": "stof/doctrine-extensions-bundle", - "version": "v1.2.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git", - "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e" + "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/7b3144572617b0555f9a443317dbc2f9cf5b524e", - "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e", + "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5", + "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5", "shasum": "" }, "require": { "gedmo/doctrine-extensions": "^2.3.1", "php": ">=5.3.2", - "symfony/framework-bundle": "~2.1" + "symfony/framework-bundle": "~2.1|~3.0" }, "suggest": { "doctrine/doctrine-bundle": "to use the ORM extensions", @@ -4629,7 +4587,7 @@ "translatable", "tree" ], - "time": "2015-08-12 16:23:48" + "time": "2015-11-26 18:29:38" }, { "name": "swiftmailer/swiftmailer", @@ -4927,120 +4885,6 @@ ], "time": "2015-11-20 09:19:13" }, - { - "name": "symfony/polyfill-php54", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2015-11-04 20:28:58" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2015-11-04 20:28:58" - }, { "name": "symfony/polyfill-php56", "version": "v1.0.1", @@ -5208,79 +5052,18 @@ ], "time": "2015-11-04 20:28:58" }, - { - "name": "symfony/security-acl", - "version": "v2.8.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-acl.git", - "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347", - "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/security-core": "~2.4|~3.0.0" - }, - "require-dev": { - "doctrine/common": "~2.2", - "doctrine/dbal": "~2.2", - "psr/log": "~1.0", - "symfony/phpunit-bridge": "~2.7|~3.0.0" - }, - "suggest": { - "doctrine/dbal": "For using the built-in ACL implementation", - "symfony/class-loader": "For using the ACL generateSql script", - "symfony/finder": "For using the ACL generateSql script" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Security\\Acl\\": "" - }, - "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 Security Component - ACL (Access Control List)", - "homepage": "https://symfony.com", - "time": "2015-12-28 09:39:09" - }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.9", + "version": "v2.3.10", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78" + "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51", + "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51", "shasum": "" }, "require": { @@ -5324,34 +5107,31 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2015-11-28 10:59:29" + "time": "2016-01-14 10:25:38" }, { "name": "symfony/symfony", - "version": "v2.8.2", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5" + "reference": "979d7323716fec847508eac3e62d59b117612a6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/f3e6a82bcbea4db3b56df08e491e20a1faae82b5", - "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5", + "url": "https://api.github.com/repos/symfony/symfony/zipball/979d7323716fec847508eac3e62d59b117612a6e", + "reference": "979d7323716fec847508eac3e62d59b117612a6e", "shasum": "" }, "require": { "doctrine/common": "~2.4", - "php": ">=5.3.9", + "php": ">=5.5.9", "psr/log": "~1.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php54": "~1.0", - "symfony/polyfill-php55": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "symfony/security-acl": "~2.7", "twig/twig": "~1.23|~2.0" }, "conflict": { @@ -5379,7 +5159,6 @@ "symfony/http-kernel": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", - "symfony/locale": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -5395,7 +5174,6 @@ "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", - "symfony/swiftmailer-bridge": "self.version", "symfony/templating": "self.version", "symfony/translation": "self.version", "symfony/twig-bridge": "self.version", @@ -5408,17 +5186,18 @@ "require-dev": { "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/doctrine-bundle": "~1.2", + "doctrine/doctrine-bundle": "~1.4", "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "phpdocumentor/reflection": "^1.0.7" + "phpdocumentor/reflection": "^1.0.7", + "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -5457,7 +5236,7 @@ "keywords": [ "framework" ], - "time": "2016-01-14 12:01:11" + "time": "2015-12-26 16:49:48" }, { "name": "tecnickcom/tcpdf", @@ -6969,7 +6748,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=5.5.0" + "php": ">=5.5.9" }, "platform-dev": [] }