From 2d776685568492876e6902876801b5a73555411c Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Thu, 3 Jun 2021 16:10:28 +0200 Subject: [PATCH 1/3] Let's try flex-require --- composer.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 53efb70..b393527 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,9 @@ "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", @@ -13,7 +16,6 @@ "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 + } } } From c2a093f7b9e7c14dc906104997f472810b036464 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Thu, 3 Jun 2021 18:29:35 +0200 Subject: [PATCH 2/3] Drop Symfony lock file --- symfony.lock | 123 --------------------------------------------------- 1 file changed, 123 deletions(-) delete mode 100644 symfony.lock diff --git a/symfony.lock b/symfony.lock deleted file mode 100644 index 3411d88..0000000 --- a/symfony.lock +++ /dev/null @@ -1,123 +0,0 @@ -{ - "dbrekelmans/bdi": { - "version": "0.3" - }, - "doctrine/data-fixtures": { - "version": "1.5.0" - }, - "doctrine/doctrine-fixtures-bundle": { - "version": "3.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "3.0", - "ref": "e5b542d4ef47d8a003c91beb35650c76907f7e53" - }, - "files": [ - "src/DataFixtures/AppFixtures.php" - ] - }, - "egulias/email-validator": { - "version": "3.1.1" - }, - "friendsoftwig/twigcs": { - "version": "v5.0.0" - }, - "php-webdriver/webdriver": { - "version": "1.10.0" - }, - "symfony/amqp-messenger": { - "version": "v5.2.7" - }, - "symfony/browser-kit": { - "version": "v5.2.4" - }, - "symfony/doctrine-messenger": { - "version": "v5.2.7" - }, - "symfony/dom-crawler": { - "version": "v5.2.4" - }, - "symfony/mailer": { - "version": "4.3", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "4.3", - "ref": "15658c2a0176cda2e7dba66276a2030b52bd81b2" - }, - "files": [ - "config/packages/mailer.yaml" - ] - }, - "symfony/messenger": { - "version": "4.3", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "4.3", - "ref": "e9a414b113ceadbf4e52abe37bf8f1b443f06ccb" - }, - "files": [ - "config/packages/messenger.yaml" - ] - }, - "symfony/mime": { - "version": "v5.2.7" - }, - "symfony/panther": { - "version": "1.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "93d9baa582d0a755cc9ef81bc38a921d5fa16973" - } - }, - "symfony/password-hasher": { - "version": "v5.3.0" - }, - "symfony/phpunit-bridge": { - "version": "5.1", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "5.1", - "ref": "bf16921ef8309a81d9f046e9b6369c46bcbd031f" - }, - "files": [ - ".env.test", - "bin/phpunit", - "phpunit.xml.dist", - "tests/bootstrap.php" - ] - }, - "symfony/polyfill-intl-idn": { - "version": "v1.22.1" - }, - "symfony/polyfill-php81": { - "version": "v1.23.0" - }, - "symfony/redis-messenger": { - "version": "v5.2.7" - }, - "symfony/validator": { - "version": "4.3", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "4.3", - "ref": "d902da3e4952f18d3bf05aab29512eb61cabd869" - }, - "files": [ - "config/packages/test/validator.yaml", - "config/packages/validator.yaml" - ] - }, - "twig/cssinliner-extra": { - "version": "v3.3.0" - }, - "twig/extra-bundle": { - "version": "v3.3.1" - } -} From 5a3763f84af4853ce6d109d6410dff90e60be528 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Thu, 3 Jun 2021 18:53:54 +0200 Subject: [PATCH 3/3] Clean up README --- README.md | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 2dc8423..b4bd76a 100644 --- a/README.md +++ b/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,7 +40,6 @@ 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 @@ -51,16 +47,19 @@ automatically. To do so, follow the steps below: 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`. - -