improved environment

Author: dmitriy

.circleci/config.yml

@@ -15,10 +15,11 @@ 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 messenger-setup-transports
 
       - run:
           name: Run unit/functional tests
@@ -30,6 +31,12 @@ jobs:
           command: |
             make report-code-coverage
 
+      - run:
+          name: Check coding standard & CodeSniffer
+          command: |
+            make ecs
+            make phpcs
+
       - store_artifacts:
           path: reports
 

.gitattributes

@@ -3,3 +3,7 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
+docs/postman/symfony.postman_collection.json binary
+tools/**/composer.lock binary
+composer.lock binary
+symfony.lock binary

.github/workflows/ci.yml

@@ -30,7 +30,13 @@ jobs:
               run: make wait-for-db
             - name: Run migrations
               run: make drop-migrate
+            - 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
 
 # disable default site and delete all default files inside APP_HOME
 RUN a2dissite 000-default.conf
@@ -70,7 +72,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
@@ -94,8 +98,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

Makefile

@@ -1,11 +1,21 @@
 dir=${CURDIR}
 project=-p symfony
 service=symfony:latest
+openssl_bin:=$(shell which openssl)
 interactive:=$(shell [ -t 0 ] && echo 1)
 ifneq ($(interactive),1)
 	optionT=-T
 endif
 
+ifndef APP_ENV
+	# Determine which .env file to use
+	ifneq ("$(wildcard .env.local)","")
+		include .env.local
+	else
+		include .env
+	endif
+endif
+
 start:
 	@docker-compose -f docker-compose.yml $(project) up -d
 
@@ -59,13 +69,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"
@@ -89,17 +99,20 @@ 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"
 
+messenger-setup-transports:
+	@make exec cmd="php bin/console messenger:setup-transports"
+
 phpunit:
-	@make exec cmd="./vendor/bin/phpunit -c phpunit.xml.dist --coverage-html reports/coverage --coverage-clover reports/clover.xml --log-junit reports/junit.xml"
+	@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"
 
 ###> php-coveralls ###
 report-code-coverage: ## update code coverage on coveralls.io. Note: COVERALLS_REPO_TOKEN should be set on CI side.

bitbucket-pipelines.yml

@@ -14,5 +14,8 @@ pipelines:
           - docker ps -a
           - make wait-for-db
           - make drop-migrate
+          - make messenger-setup-transports
           - make phpunit
+          - make ecs
+          - make phpcs
           - make stop-test

composer.json

@@ -22,23 +22,20 @@
 			"role": "Developer"
 		}
 	],
-	"support": {
-		"issues": "https://github.com/dimadeush/docker-apache-php-symfony/issues"
-	},
-	"prefer-stable": true,
 	"require": {
 		"php": "^7.4.0",
+		"ext-amqp": "*",
 		"ext-ctype": "*",
 		"ext-iconv": "*",
 		"ext-json": "*",
 		"ext-mbstring": "*",
 		"ext-pdo": "*",
 		"ext-pdo_mysql": "*",
 		"doctrine/doctrine-migrations-bundle": "^2.1",
-		"jmose/command-scheduler-bundle": "^2.0",
+		"easycorp/easy-log-handler": "1.0.*",
+		"jmose/command-scheduler-bundle": "^2.2",
 		"sensio/framework-extra-bundle": "^5.5",
 		"sensiolabs/security-checker": "^6.0",
-		"symfony/amqp-pack": "^1.0",
 		"symfony/apache-pack": "^1.0",
 		"symfony/asset": "4.4.*",
 		"symfony/config": "4.4.*",
@@ -64,14 +61,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/test-pack": "*"
+		"symfony/requirements-checker": "^1.1"
 	},
 	"config": {
 		"platform": {
@@ -82,50 +92,49 @@
 		},
 		"sort-packages": true
 	},
+	"extra": {
+		"bamarni-bin": {
+			"target-directory": "tools"
+		},
+		"symfony": {
+			"allow-contrib": true,
+			"require": "4.4.*"
+		}
+	},
 	"autoload": {
 		"psr-4": {
 			"App\\": "src/"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"App\\Tests\\": "tests/"
+			"App\\Tests\\": "tests/",
+			"PHPUnit\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/",
+			"PHPUnit\\Framework\\MockObject\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility",
+			"Symfony\\Component\\BrowserKit\\": "tools/01_phpunit/vendor/symfony/browser-kit",
+			"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",
-			"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-apache-php-symfony/issues"
 	}
 }