Merge pull request #2807 from nanasess/update-composer

すべての依存パッケージを composer.json に記載

.gitignore

@@ -35,9 +35,17 @@ composer.phar
 .idea
 *.php~
 .env
-.web-server-pid
 
 ###> symfony/phpunit-bridge ###
 .phpunit
 /phpunit.xml
 ###< symfony/phpunit-bridge ###
+
+###> friendsofphp/php-cs-fixer ###
+.php_cs
+.php_cs.cache
+###< friendsofphp/php-cs-fixer ###
+
+###> symfony/web-server-bundle ###
+.web-server-pid
+###< symfony/web-server-bundle ###

composer.json

@@ -15,29 +15,49 @@
         "php": "^7.0.8",
         "ext-intl": "^1.1",
         "ext-mbstring": "*",
-        "composer/ca-bundle": "^1.0",
-        "composer/composer": "^1.5",
+        "composer/ca-bundle": "^1.1",
+        "composer/composer": "^1.6",
+        "doctrine/annotations": "^1.4",
+        "doctrine/cache": "^1.6",
+        "doctrine/collections": "^1.4",
+        "doctrine/common": "^2.7",
         "doctrine/data-fixtures": "^1.2",
-        "doctrine/doctrine-fixtures-bundle": "^2.3",
+        "doctrine/dbal": "^2.5",
+        "doctrine/doctrine-bundle": "^1.8",
+        "doctrine/doctrine-cache-bundle": "^1.3",
+        "doctrine/doctrine-fixtures-bundle": "^3.0",
+        "doctrine/doctrine-migrations-bundle": "^1.3",
+        "doctrine/inflector": "^1.2",
+        "doctrine/instantiator": "^1.0",
+        "doctrine/lexer": "^1.0",
         "doctrine/migrations": "^1.5",
         "doctrine/orm": "^2.5",
         "egulias/email-validator": "^2.1",
-        "guzzlehttp/guzzle": "^6.2",
+        "guzzlehttp/guzzle": "^6.3",
         "knplabs/knp-paginator-bundle": "^2.7",
         "mobiledetect/mobiledetectlib": "^2.8",
+        "monolog/monolog": "^1.23",
         "nesbot/carbon": "^1.22",
         "pimple/pimple": "^1.1",
+        "psr/cache": "^1.0",
+        "psr/container": "^1.0",
+        "psr/http-message": "^1.0",
         "psr/log": "^1.0",
+        "psr/simple-cache": "^1.0",
         "sensio/framework-extra-bundle": "^5.1",
         "sensio/generator-bundle": "^3.1",
-        "suncat/mobile-detect-bundle": "^1.0",
+        "suncat/mobile-detect-bundle": "^1.1",
         "swiftmailer/swiftmailer": "^6.0",
         "symfony/asset": "^3.4",
+        "symfony/cache": "^3.4",
         "symfony/class-loader": "^3.4",
         "symfony/config": "^3.4",
         "symfony/console": "^3.4",
         "symfony/css-selector": "^3.4",
+        "symfony/debug": "^3.4",
+        "symfony/debug-bundle": "^3.4",
         "symfony/debug-pack": "^1.0",
+        "symfony/dependency-injection": "^3.4",
         "symfony/doctrine-bridge": "^3.4",
         "symfony/dom-crawler": "^3.4",
         "symfony/dotenv": "^3.4",
@@ -66,21 +86,24 @@
         "symfony/swiftmailer-bundle": "^3.1",
         "symfony/templating": "^3.4",
         "symfony/translation": "^3.4",
+        "symfony/twig-bridge": "^3.4",
         "symfony/twig-bundle": "^3.4",
         "symfony/validator": "^3.4",
         "symfony/var-dumper": "^3.4",
         "symfony/web-profiler-bundle": "^3.4",
-        "symfony/yaml": "^3.4"
+        "symfony/yaml": "^3.4",
+        "twig/twig": "^2.4"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^4.0",
         "easycorp/easy-log-handler": "^1.0",
-        "friendsofphp/php-cs-fixer": "^2.2",
+        "friendsofphp/php-cs-fixer": "^2.10",
         "fzaninotto/faker": "^1.7",
         "mikey179/vfsStream": "^1.6",
         "php-coveralls/php-coveralls": "^2.0",
         "symfony/browser-kit": "^3.4",
         "symfony/maker-bundle": "^1.0",
+        "symfony/phpunit-bridge": "^3.4",
         "symfony/web-server-bundle": "^3.4"
     },
     "autoload": {
@@ -127,6 +150,7 @@
         ]
     },
     "conflict": {
+        "symfony/debug": "3.4.4",
         "symfony/symfony": "*",
         "easycorp/easy-log-handler": "1.0.4"
     },