Merge pull request #44 from sumocoders/flex

Flex

README.md

@@ -9,10 +9,9 @@ Use the following commands to create a new project:
 
 Start you project by running:
 
-    symfony server:start
-    npm run-script watch
+    symfony serve
+    npm run watch
 
-
 ## Configuration
 ### Deployment
 Open `deploy.php` and check the configuration, replace the example values 
@@ -22,11 +21,9 @@ Try to deploy to staging by running:
 
     symfony php vendor/bin/dep deploy staging
 
-
-Log in thru `ssh` on the dev-server and alter the `.env.local`-file to use the
+Log in through `ssh` on the dev-server and alter the `.env.local`-file to use the
 correct credentials.
 
-
 ### Continuous deployment to staging
 Each time something is merged into the staging branch it can be deployed 
 automatically. To do so, follow the steps below:
@@ -43,24 +40,26 @@ automatically. To do so, follow the steps below:
     `ssh-keyscan -H dev02.sumocoders.eu`.
 6. Open `.gitlab-ci.yaml`, scroll to `Deploy - to staging`.
 7. Alter the url under `environment → url`.
-
 
 ## Usage
 ### Using Encore
 
 Building assets:
 
     # compile assets once
-    npm run-script dev
+    npm run dev
 
     # or, recomile assets automatically when files change
-    npm run-script watch
+    npm run watch
 
     # on deploy, create a production build
-    npm run-script build
+    npm run build
 
 For more information about Encore, see the [official documentation](https://symfony.com/doc/current/frontend.html#webpack-encore).
 
+## Tests
+We use [panther](https://github.com/symfony/panther) to add functional tests to our project.
+By default, a page response 200 should be tested on al pages. To do this you can add your urls to the `providePublicUrls` and/or `provideLoggedInUrls`.
 
 ## Working on the Skeleton
 ### Testing `create-project` locally
@@ -73,9 +72,3 @@ This will create a new project that uses the commited code in the selected branc
 The new project will be located in the TARGETDIR
 
 Kudos to [beporter](https://gist.github.com/beporter/31e7d1f5beeffda0da94).
-
-## Tests
-We use [panther](https://github.com/symfony/panther) to add functional tests to our project.
-By default a page response 200 should be tested on al pages. To do this you can add your urls to the `providePublicUrls` and/or `provideLoggedInUrls`.
-
-

composer.json

@@ -6,14 +6,16 @@
         "php": "^7.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
+        "symfony/flex": "^1.6.2"
+    },
+    "flex-require": {
         "beberlei/doctrineextensions": "^1.2",
         "doctrine/doctrine-migrations-bundle": "^2.0",
         "sentry/sentry-symfony": "^3.1",
         "sumocoders/framework-core-bundle": "^4.0",
         "symfony/apache-pack": "^1.0.1",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^5.0",
-        "symfony/flex": "^1.6.2",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^5.0",
         "symfony/web-profiler-bundle": "^5.1",
@@ -28,6 +30,8 @@
         "willdurand/js-translation-bundle": "^4.0"
     },
     "require-dev": {
+    },
+    "flex-require-dev": {
         "dbrekelmans/bdi": "^0.3.0",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "friendsoftwig/twigcs": "^5.0",
@@ -40,6 +44,7 @@
         "tijsverkoyen/deployer-sumo": "^1.4"
     },
     "config": {
+        "optimize-autoloader": true,
         "sort-packages": true
     },
     "autoload": {
@@ -62,5 +67,10 @@
             "@auto-scripts"
         ],
         "post-create-project-cmd": "App\\Skeleton\\PostCreateProject::run"
+    },
+    "extra": {
+        "symfony": {
+            "allow-contrib": true
+        }
     }
 }