Upgrading to Symfony 4.0-BETA1

janit · Oct 19, 2017 · 7979be2 · 7979be2
1 parent 0ebc328
commit 7979be2
Show file tree

Hide file tree

Showing 24 changed files with 1,643 additions and 1,422 deletions.
diff --git a/.env.dist b/.env.dist
@@ -11,9 +11,7 @@ APP_SECRET=e708fa001dfb807d4a7fe55d6b3af9a5
 
 ###> doctrine/doctrine-bundle ###
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
+# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls
-# DATABASE_URL="mysql://root@127.0.0.1:3306/symfony?charset=utf8mb4&serverVersion=5.7"
-DATABASE_URL="sqlite:///../var/data.db"
-
+ENV DATABASE_URL "sqlite:///../var/data.db"
 ###< doctrine/doctrine-bundle ###
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 /node_modules/
 /vendor/
 /var/cache/
-/public/build/
+/public/build/
+###> symfony/web-server-bundle ###
+.web-server-pid
+###< symfony/web-server-bundle ###
diff --git a/Dockerfile b/Dockerfile
@@ -50,9 +50,9 @@ RUN rm -Rf docker/
 #ENV SKELETON_COMPOSER_JSON https://raw.githubusercontent.com/symfony/skeleton/v3.3.2/composer.json
 #RUN [ -f composer.json ] || php -r "copy('$SKELETON_COMPOSER_JSON', 'composer.json');"
 
-ENV APP_ENV dev
-ENV APP_DEBUG 1
-ENV APP_SECRET e708fa001dfb807d4a7fe55d6b3af9a5
+ENV APP_ENV prod
+ENV APP_DEBUG 0
+ENV APP_SECRET z708fa001dfb807d4a7fe55d6b3af9a5
 ENV DATABASE_URL "sqlite:///../var/data.db"
 
 RUN mkdir -p var/cache var/logs var/sessions \

diff --git a/Makefile b/Makefile
diff --git a/composer.json b/composer.json
@@ -1,18 +1,22 @@
 {
     "type": "project",
     "license": "proprietary",
+    "minimum-stability": "dev",
     "require": {
-        "php": "^7.1.3",
-        "javiereguiluz/easyadmin-bundle": "^1.16",
-        "sensio/framework-extra-bundle": "^3.0",
-        "symfony/annotations-pack": "^1.0",
+        "php": "^7.0.8",
+        "javiereguiluz/easyadmin-bundle": "^1.16@dev",
+        "sensio/framework-extra-bundle": "^4.0@dev",
+        "symfony/console": "^4.0",
+        "symfony/debug-bundle": "^4.0@dev",
         "symfony/flex": "^1.0",
-        "symfony/framework-bundle": "^3.3",
-        "symfony/serializer": "^3.3",
-        "symfony/yaml": "^3.3"
+        "symfony/framework-bundle": "^4.0",
+        "symfony/lts": "^4@dev",
+        "symfony/serializer": "^4.0",
+        "symfony/web-server-bundle": "^4.0@dev",
+        "symfony/yaml": "^4.0"
     },
     "require-dev": {
-        "symfony/dotenv": "^3.3"
+        "symfony/dotenv": "^4.0"
     },
     "config": {
         "preferred-install": {
@@ -32,7 +36,7 @@
     },
     "scripts": {
         "auto-scripts": {
-            "make cache-warmup": "script",
+            "cache:clear": "symfony-cmd",
             "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
         },
         "post-install-cmd": [
@@ -43,13 +47,11 @@
         ]
     },
     "conflict": {
-        "symfony/symfony": "*",
-        "symfony/twig-bundle": "<3.3",
-        "symfony/debug": "<3.3"
+        "symfony/symfony": "*"
     },
     "extra": {
         "symfony": {
-            "id": "01BK9RYA07YR07P9EQ2RCQYQ85",
+            "id": "01BWSR0FNGXVXP99B866TD3XF1",
             "allow-contrib": false
         }
     }