From e23edfd287bb21f8bf75f28f90a2b546b3bd3929 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 6 Dec 2015 14:39:01 +0100 Subject: Update deps Changelogs summary: - doctrine/cache updated from v1.5.1 to v1.5.2 See changes: https://github.com/doctrine/cache/compare/v1.5.1...v1.5.2 Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.2 - doctrine/common updated from v2.5.1 to v2.5.2 See changes: https://github.com/doctrine/common/compare/v2.5.1...v2.5.2 Release notes: https://github.com/doctrine/common/releases/tag/v2.5.2 - symfony/polyfill-mbstring installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-mbstring/releases/tag/v1.0.0 - symfony/polyfill-util installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-util/releases/tag/v1.0.0 - paragonie/random_compat installed in version 1.1.1 Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.1 - symfony/polyfill-php70 installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-php70/releases/tag/v1.0.0 - symfony/polyfill-php56 installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-php56/releases/tag/v1.0.0 - ircmaxell/password-compat installed in version v1.0.4 Release notes: https://github.com/ircmaxell/password_compat/releases/tag/v1.0.4 - symfony/polyfill-php55 installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-php55/releases/tag/v1.0.0 - symfony/polyfill-php54 installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-php54/releases/tag/v1.0.0 - symfony/polyfill-intl-icu installed in version v1.0.0 Release notes: https://github.com/symfony/polyfill-intl-icu/releases/tag/v1.0.0 - symfony/symfony updated from v2.7.7 to v2.8.0 See changes: https://github.com/symfony/symfony/compare/v2.7.7...v2.8.0 Release notes: https://github.com/symfony/symfony/releases/tag/v2.8.0 - symfony/security-acl installed in version v2.7.7 Release notes: https://github.com/symfony/security-acl/releases/tag/v2.7.7 - doctrine/orm updated from v2.5.1 to v2.5.2 See changes: https://github.com/doctrine/doctrine2/compare/v2.5.1...v2.5.2 Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.2 - kriswallsmith/assetic updated from v1.3.1 to v1.3.2 See changes: https://github.com/kriswallsmith/assetic/compare/v1.3.1...v1.3.2 Release notes: https://github.com/kriswallsmith/assetic/releases/tag/v1.3.2 - symfony/assetic-bundle updated from v2.7.0 to v2.7.1 See changes: https://github.com/symfony/assetic-bundle/compare/v2.7.0...v2.7.1 Release notes: https://github.com/symfony/assetic-bundle/releases/tag/v2.7.1 - symfony/swiftmailer-bundle updated from v2.3.8 to v2.3.9 See changes: https://github.com/symfony/swiftmailer-bundle/compare/v2.3.8...v2.3.9 Release notes: https://github.com/symfony/swiftmailer-bundle/releases/tag/v2.3.9 - symfony/monolog-bundle updated from 2.8.1 to v2.8.2 See changes: https://github.com/symfony/monolog-bundle/compare/2.8.1...v2.8.2 Release notes: https://github.com/symfony/monolog-bundle/releases/tag/v2.8.2 - sensio/distribution-bundle updated from v3.0.33 to v3.0.34 See changes: https://github.com/sensiolabs/SensioDistributionBundle/compare/v3.0.33...v3.0.34 Release notes: https://github.com/sensiolabs/SensioDistributionBundle/releases/tag/v3.0.34 - friendsofsymfony/rest-bundle updated from 1.7.2 to 1.7.4 See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.2...1.7.4 Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.4 - nelmio/api-doc-bundle updated from 2.10.3 to 2.11.0 See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.10.3...2.11.0 Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.0 - j0k3r/graby-site-config updated from 1.0.6 to 1.0.9 See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.6...1.0.9 Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.9 - j0k3r/safecurl updated from v1.1.1 to 2.0.2 See changes: https://github.com/j0k3r/safecurl/compare/v1.1.1...2.0.2 Release notes: https://github.com/j0k3r/safecurl/releases/tag/2.0.2 - j0k3r/graby updated from 1.0.4 to 1.0.6 See changes: https://github.com/j0k3r/graby/compare/1.0.4...1.0.6 Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.6 - scheb/two-factor-bundle updated from v1.4.7 to v1.5.0 See changes: https://github.com/scheb/two-factor-bundle/compare/v1.4.7...v1.5.0 Release notes: https://github.com/scheb/two-factor-bundle/releases/tag/v1.5.0 - sebastian/recursion-context updated from 1.0.1 to 1.0.2 See changes: https://github.com/sebastianbergmann/recursion-context/compare/1.0.1...1.0.2 Release notes: https://github.com/sebastianbergmann/recursion-context/releases/tag/1.0.2 - sebastian/environment updated from 1.3.2 to 1.3.3 See changes: https://github.com/sebastianbergmann/environment/compare/1.3.2...1.3.3 Release notes: https://github.com/sebastianbergmann/environment/releases/tag/1.3.3 - sebastian/diff updated from 1.3.0 to 1.4.0 See changes: https://github.com/sebastianbergmann/diff/compare/1.3.0...1.4.0 Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.0 - phpunit/phpunit updated from 4.8.18 to 4.8.19 See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.18...4.8.19 Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.19 - symfony/phpunit-bridge updated from v2.7.7 to v2.8.0 See changes: https://github.com/symfony/phpunit-bridge/compare/v2.7.7...v2.8.0 Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v2.8.0 - doctrine/doctrine-cache-bundle updated from 1.2.1 to 1.2.2 See changes: https://github.com/doctrine/DoctrineCacheBundle/compare/1.2.1...1.2.2 Release notes: https://github.com/doctrine/DoctrineCacheBundle/releases/tag/1.2.2 - doctrine/doctrine-bundle updated from v1.5.2 to 1.6.1 See changes: https://github.com/doctrine/DoctrineBundle/compare/v1.5.2...1.6.1 Release notes: https://github.com/doctrine/DoctrineBundle/releases/tag/1.6.1 - phpzip/phpzip updated from 2.0.7 to 2.0.8 See changes: https://github.com/Grandt/PHPZip/compare/2.0.7...2.0.8 Release notes: https://github.com/Grandt/PHPZip/releases/tag/2.0.8 - kphoen/rulerz updated from 0.14.0 to 0.16.1 See changes: https://github.com/K-Phoen/rulerz/compare/0.14.0...0.16.1 Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.1 - friendsofsymfony/user-bundle updated from dev-master to dev-master See changes: https://github.com/FriendsOfSymfony/FOSUserBundle/compare/45d6f40...e39b040 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 3300c0fb..4018cd51 100644 --- a/composer.json +++ b/composer.json @@ -29,9 +29,9 @@ }, "require": { "php": ">=5.5.0", - "symfony/symfony": "~2.7.0", + "symfony/symfony": "~2.8", "doctrine/orm": "~2.3", - "doctrine/doctrine-bundle": "1.5.2", + "doctrine/doctrine-bundle": "~1.5", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", @@ -67,7 +67,7 @@ "doctrine/doctrine-fixtures-bundle": "~2.2.0", "sensio/generator-bundle": "~2.5", "phpunit/phpunit": "~4.4", - "symfony/phpunit-bridge": "~2.7.0" + "symfony/phpunit-bridge": "~2.7" }, "repositories": [ { -- cgit v1.2.3 From 516022d60ea5c4e0c18a222590d23190a2c7765f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 09:34:32 +0100 Subject: Improve composer.json Following great article from Jordi: http://seld.be/notes/new-composer-patterns Changelogs summary: - paragonie/random_compat updated from 1.1.1 to 1.1.4 See changes: https://github.com/paragonie/random_compat/compare/1.1.1...1.1.4 Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.4 - doctrine/cache updated from v1.5.2 to v1.5.4 See changes: https://github.com/doctrine/cache/compare/v1.5.2...v1.5.4 Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.4 - sensio/framework-extra-bundle updated from v3.0.11 to v3.0.12 See changes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/compare/v3.0.11...v3.0.12 Release notes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/releases/tag/v3.0.12 - nelmio/cors-bundle updated from 1.4.0 to 1.4.1 See changes: https://github.com/nelmio/NelmioCorsBundle/compare/1.4.0...1.4.1 Release notes: https://github.com/nelmio/NelmioCorsBundle/releases/tag/1.4.1 - friendsofsymfony/rest-bundle updated from 1.7.4 to 1.7.6 See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.4...1.7.6 Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.6 - nelmio/api-doc-bundle updated from 2.11.0 to 2.11.1 See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.0...2.11.1 Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.1 - neitanod/forceutf8 updated from v1.5 to v2.0 See changes: https://github.com/neitanod/forceutf8/compare/v1.5...v2.0 Release notes: https://github.com/neitanod/forceutf8/releases/tag/v2.0 - j0k3r/graby-site-config updated from 1.0.9 to 1.0.10 See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.9...1.0.10 Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.10 - j0k3r/graby updated from 1.0.6 to 1.0.7 See changes: https://github.com/j0k3r/graby/compare/1.0.6...1.0.7 Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.7 - sebastian/diff updated from 1.4.0 to 1.4.1 See changes: https://github.com/sebastianbergmann/diff/compare/1.4.0...1.4.1 Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.1 - phpunit/phpunit updated from 4.8.19 to 4.8.21 See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.21 Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.21 - kphoen/rulerz updated from 0.16.1 to 0.16.2 See changes: https://github.com/K-Phoen/rulerz/compare/0.16.1...0.16.2 Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.2 --- composer.json | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4018cd51..cce26702 100644 --- a/composer.json +++ b/composer.json @@ -69,29 +69,22 @@ "phpunit/phpunit": "~4.4", "symfony/phpunit-bridge": "~2.7" }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/wallabag/phpMobi" - } - ], "scripts": { - "post-install-cmd": [ - "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + "build-parameters": [ + "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters" ], - "post-update-cmd": [ - "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", + "post-cmd": [ + "@build-parameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ], - "build-parameters": [ - "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters" + "post-install-cmd": [ + "@post-cmd" + ], + "post-update-cmd": [ + "@post-cmd" ] }, "extra": { -- cgit v1.2.3 From 5c895a7fd15822856fb407910264c5d95e1e223c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 13:00:37 +0100 Subject: Update bundle & stock file - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler --- composer.json | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index cce26702..b9591aa3 100644 --- a/composer.json +++ b/composer.json @@ -30,26 +30,27 @@ "require": { "php": ">=5.5.0", "symfony/symfony": "~2.8", - "doctrine/orm": "~2.3", - "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "^2.5", + "doctrine/doctrine-bundle": "^1.6", + "doctrine/doctrine-cache-bundle": "^1.2", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", - "symfony/swiftmailer-bundle": "~2.3", - "symfony/monolog-bundle": "~2.4", - "sensio/distribution-bundle": "~3.0.12", - "sensio/framework-extra-bundle": "~3.0", - "incenteev/composer-parameter-handler": "~2.0", + "symfony/swiftmailer-bundle": "^2.3", + "symfony/monolog-bundle": "^2.8", + "sensio/distribution-bundle": "^5.0", + "sensio/framework-extra-bundle": "^3.0.2", + "incenteev/composer-parameter-handler": "^2.0", "nelmio/cors-bundle": "~1.4.0", "friendsofsymfony/rest-bundle": "~1.4", - "jms/serializer-bundle": "~0.13", + "jms/serializer-bundle": "~1.0", "nelmio/api-doc-bundle": "~2.7", "ezyang/htmlpurifier": "~4.6", "mgargano/simplehtmldom": "~1.5", "tecnickcom/tcpdf": "~6.2", "simplepie/simplepie": "~1.3.1", - "willdurand/hateoas-bundle": "~0.5.0", + "willdurand/hateoas-bundle": "~1.0", "htmlawed/htmlawed": "~1.1.19", - "liip/theme-bundle": "~1.1.3", + "liip/theme-bundle": "~1.1", "pagerfanta/pagerfanta": "~1.0.3", "lexik/form-filter-bundle": "~4.0", "j0k3r/graby": "~1.0", @@ -64,8 +65,8 @@ "doctrine/doctrine-migrations-bundle": "^1.0" }, "require-dev": { - "doctrine/doctrine-fixtures-bundle": "~2.2.0", - "sensio/generator-bundle": "~2.5", + "doctrine/doctrine-fixtures-bundle": "~2.2", + "sensio/generator-bundle": "~3.0", "phpunit/phpunit": "~4.4", "symfony/phpunit-bridge": "~2.7" }, @@ -78,7 +79,8 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ], "post-install-cmd": [ "@post-cmd" @@ -102,7 +104,8 @@ } }, "autoload": { - "psr-0": { "": "src/" } + "psr-0": { "": "src/" }, + "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, "config": { "bin-dir": "bin" -- cgit v1.2.3 From b4faefc04dee1f84ba91d86c96ccc79388e98cd6 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 13:09:10 +0100 Subject: Switch to psr-4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index b9591aa3..3a32c02f 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,7 @@ } }, "autoload": { - "psr-0": { "": "src/" }, + "psr-4": { "": "src/" }, "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, "config": { -- cgit v1.2.3 From 8ba854c068f541039d81524d171769b6e1220171 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 31 Dec 2015 18:51:35 +0100 Subject: TwoFactorBundle -> 2.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 3a32c02f..2a5928e3 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "friendsofsymfony/user-bundle": "dev-master", "friendsofsymfony/oauth-server-bundle": "^1.4@dev", "stof/doctrine-extensions-bundle": "^1.2@dev", - "scheb/two-factor-bundle": "~1.4.0", + "scheb/two-factor-bundle": "~2.0", "grandt/phpepub": "~4.0", "wallabag/php-mobi": "~1.0.0", "kphoen/rulerz-bundle": "~0.10", -- cgit v1.2.3 From 6108b0f26ca33442279d643cf17b1f380432fa9f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 13 Jan 2016 22:34:54 +0100 Subject: Update deps LexikFormFilterBundle & RulerZBundle are now Symfony 3 compatible There are still some issue with FOSOAuthServerBundle --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 2a5928e3..46630f77 100644 --- a/composer.json +++ b/composer.json @@ -52,10 +52,10 @@ "htmlawed/htmlawed": "~1.1.19", "liip/theme-bundle": "~1.1", "pagerfanta/pagerfanta": "~1.0.3", - "lexik/form-filter-bundle": "~4.0", + "lexik/form-filter-bundle": "~5.0", "j0k3r/graby": "~1.0", "friendsofsymfony/user-bundle": "dev-master", - "friendsofsymfony/oauth-server-bundle": "^1.4@dev", + "friendsofsymfony/oauth-server-bundle": "^1.5@dev", "stof/doctrine-extensions-bundle": "^1.2@dev", "scheb/two-factor-bundle": "~2.0", "grandt/phpepub": "~4.0", -- cgit v1.2.3 From 31e33fc42e76bad4aca448f13f3f6fc7fd1f0641 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 14 Jan 2016 18:23:03 +0100 Subject: Update to Symfony 3.0.x --- composer.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 46630f77..78b32307 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", -- cgit v1.2.3