refactoring and improved environment

Author: dmitriy

.circleci/config.yml

@@ -15,11 +15,13 @@ jobs:
             make start-test
 
       - run:
-          name: Wait for DB container is running and initialize DB
+          name: Wait for DB container is running and initialize DB & messenger component
           command: |
             make wait-for-db
             make drop-migrate
             make generate-jwt-keys
+            make create-roles-groups
+            make messenger-setup-transports
 
       - run:
           name: Run unit/functional tests
@@ -31,6 +33,12 @@ jobs:
           command: |
             make report-code-coverage
 
+      - run:
+          name: Check coding standard & CodeSniffer
+          command: |
+            make ecs
+            make phpcs
+
       - store_artifacts:
           path: reports
 

.github/workflows/ci.yml

@@ -32,7 +32,15 @@ jobs:
               run: make drop-migrate
             - name: Generate keys
               run: make generate-jwt-keys
+            - name: Create roles and groups
+              run: make create-roles-groups
+            - name: Setup transports for Messenger component
+              run: make messenger-setup-transports
             - name: Run test suite
               run: make phpunit
+            - name: Run coding standard
+              run: make ecs
+            - name: Run codeSniffer
+              run: make phpcs
             - name: Stop the docker images
               run: make stop-test

.gitignore

@@ -10,6 +10,7 @@ reports/*
 /public/bundles/
 /var/
 /vendor/
+/tools/**/vendor
 ###< symfony/framework-bundle ###
 
 ###> symfony/phpunit-bridge ###

Dockerfile

@@ -32,16 +32,18 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       librabbitmq-dev \
     && pecl install amqp \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
+    && docker-php-ext-configure intl \
     && docker-php-ext-install \
       pdo_mysql \
       sockets \
       intl \
+      opcache \
       zip \
-    && docker-php-ext-enable amqp && \
-      rm -fr /tmp/* && \
-      rm -rf /var/list/apt/* && \
-      rm -r /var/lib/apt/lists/* && \
-      apt-get clean
+    && docker-php-ext-enable amqp \
+    && rm -rf /tmp/* \
+    && rm -rf /var/list/apt/* \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
 
 # create document root
 RUN mkdir -p $APP_HOME/public
@@ -59,7 +61,9 @@ COPY ./docker/dev/xdebug.ini /tmp/
 RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
 
 # install composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+RUN chmod +x /usr/bin/composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
 
 # add supervisor
 RUN mkdir -p /var/log/supervisor
@@ -79,8 +83,8 @@ USER www-data
 COPY --chown=www-data:www-data . $APP_HOME/
 
 # install all PHP dependencies
-RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then composer install --optimize-autoloader --no-interaction --no-progress; \
-    else export APP_ENV=$BUILD_ARGUMENT_ENV && composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
+RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress; \
+    else export APP_ENV=$BUILD_ARGUMENT_ENV && COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
     fi
 
 # create cached config file .env.local.php in case prod environment

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020 Dmitriy Kravtsov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -91,13 +91,13 @@ wait-for-db:
 	@make exec cmd="php bin/console db:wait"
 
 composer-install-prod:
-	@make exec cmd="composer install --optimize-autoloader --no-dev"
+	@make exec-bash cmd="COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-dev"
 
 composer-install:
-	@make exec cmd="composer install --optimize-autoloader"
+	@make exec-bash cmd="COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader"
 
 composer-update:
-	@make exec cmd="composer update"
+	@make exec-bash cmd="COMPOSER_MEMORY_LIMIT=-1 composer update"
 
 info:
 	@make exec cmd="bin/console --version"
@@ -124,15 +124,21 @@ drop-migrate:
 	@make migrate
 
 migrate-prod:
-	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction"
+	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --all-or-nothing"
 
 migrate:
-	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction"
-	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --env=test"
+	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --all-or-nothing"
+	@make exec cmd="php bin/console doctrine:migrations:migrate --no-interaction --all-or-nothing --env=test"
 
 fixtures:
 	@make exec cmd="php bin/console doctrine:fixtures:load --env=test"
 
+create-roles-groups:
+	@make exec cmd="php bin/console user:create-roles-groups"
+
+messenger-setup-transports:
+	@make exec cmd="php bin/console messenger:setup-transports"
+
 phpunit:
 	@make exec-bash cmd="rm -rf ./var/cache/test* && bin/console cache:warmup --env=test && ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-html reports/coverage --coverage-clover reports/clover.xml --log-junit reports/junit.xml"
 

bitbucket-pipelines.yml

@@ -15,5 +15,9 @@ pipelines:
           - make wait-for-db
           - make drop-migrate
           - make generate-jwt-keys
+          - make create-roles-groups
+          - make messenger-setup-transports
           - make phpunit
+          - make ecs
+          - make phpcs
           - make stop-test

composer.json

@@ -23,10 +23,6 @@
             "role": "Developer"
         }
     ],
-    "support": {
-        "issues": "https://github.com/dimadeush/docker-symfony-api/issues"
-    },
-    "prefer-stable": true,
     "require": {
         "php": "^7.4.0",
         "ext-ctype": "*",
@@ -35,19 +31,19 @@
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "ext-pdo_mysql": "*",
+        "antishov/doctrine-extensions-bundle": "^1.4",
         "doctrine/doctrine-migrations-bundle": "^2.1",
         "easycorp/easy-log-handler": "1.0.*",
-        "jmose/command-scheduler-bundle": "^2.0",
+        "jmose/command-scheduler-bundle": "^2.2",
         "lexik/jwt-authentication-bundle": "^2.6",
         "mark-gerarts/automapper-plus-bundle": "^1.2",
         "matthiasnoback/symfony-console-form": "^3.6",
-        "nelmio/api-doc-bundle": "^3.5",
+        "nelmio/api-doc-bundle": "^3.6",
         "nelmio/cors-bundle": "^2.0",
         "piwik/device-detector": "^3.12",
         "ramsey/uuid-doctrine": "^1.6",
         "sensio/framework-extra-bundle": "^5.5",
         "sensiolabs/security-checker": "^6.0",
-        "antishov/doctrine-extensions-bundle": "^1.4",
         "symfony/amqp-pack": "^1.0",
         "symfony/asset": "4.4.*",
         "symfony/config": "4.4.*",
@@ -73,13 +69,27 @@
         "symfony/web-link": "4.4.*",
         "symfony/yaml": "4.4.*"
     },
+    "replace": {
+        "paragonie/random_compat": "2.*",
+        "symfony/polyfill-ctype": "*",
+        "symfony/polyfill-iconv": "*",
+        "symfony/polyfill-php56": "*",
+        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php72": "*"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.3",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "ergebnis/composer-normalize": "^2.3",
         "roave/security-advisories": "dev-master",
         "symfony/debug-pack": "*",
         "symfony/maker-bundle": "^1.14",
-        "symfony/profiler-pack": "*"
+        "symfony/profiler-pack": "*",
+        "symfony/requirements-checker": "^1.1"
     },
     "config": {
         "platform": {
@@ -90,6 +100,15 @@
         },
         "sort-packages": true
     },
+    "extra": {
+        "bamarni-bin": {
+            "target-directory": "tools"
+        },
+        "symfony": {
+            "allow-contrib": true,
+            "require": "4.4.*"
+        }
+    },
     "autoload": {
         "psr-4": {
             "App\\": "src/"
@@ -104,41 +123,26 @@
             "Symfony\\Bridge\\PhpUnit\\": "tools/01_phpunit/vendor/symfony/phpunit-bridge"
         }
     },
-    "replace": {
-        "paragonie/random_compat": "2.*",
-        "symfony/polyfill-ctype": "*",
-        "symfony/polyfill-iconv": "*",
-        "symfony/polyfill-php72": "*",
-        "symfony/polyfill-php71": "*",
-        "symfony/polyfill-php70": "*",
-        "symfony/polyfill-php56": "*"
-    },
+    "prefer-stable": true,
     "scripts": {
-        "auto-scripts": {
-            "cache:clear": "symfony-cmd",
-            "cache:warmup": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "security-checker security:check": "script"
-        },
         "post-install-cmd": [
+            "if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
             "if test -d vendor/bamarni/composer-bin-plugin; then composer bin all install; fi",
             "@auto-scripts"
         ],
         "post-update-cmd": [
+            "if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
             "if test -d vendor/bamarni/composer-bin-plugin; then composer bin all update; fi",
             "@auto-scripts"
-        ]
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "extra": {
-        "bamarni-bin": {
-            "target-directory": "tools"
-        },
-        "symfony": {
-            "allow-contrib": true,
-            "require": "4.4.*"
+        ],
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "cache:warmup": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "security-checker security:check": "script"
         }
+    },
+    "support": {
+        "issues": "https://github.com/dimadeush/docker-symfony-api/issues"
     }
 }