Upgrade to use Drupal 9.1

1. Added composer.json similar to goalgorilla/drupal_social#362 2. Extends image from Drupal 9.1 3. Changed the way composer install command runs.
goalgorilla · Nov 19, 2021 · afe6c69 · afe6c69
1 parent 35dcf78
commit afe6c69
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 34 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM drupal:8.9
+FROM drupal:9.1
 MAINTAINER [email protected]
 
 # Install packages.
@@ -32,7 +32,7 @@ RUN rm -rf /root/.composer
 ADD composer.json /var/www/composer.json
 WORKDIR /var/www/
 ENV COMPOSER_ALLOW_SUPERUSER=1
-RUN COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction --no-dev
+RUN COMPOSER_MEMORY_LIMIT=-1 composer install
 
 WORKDIR /var/www/html/
 RUN chown -R www-data:www-data *

diff --git a/composer.json b/composer.json
@@ -5,30 +5,45 @@
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "config": {
+        "optimize-autoloader": true,
+        "update-with-dependencies": true,
+        "sort-packages": true
+    },
     "require": {
-        "drush/drush": "8.*@stable",
-        "goalgorilla/open_social": "10.1.x-dev",
-        "goalgorilla/open_social_scripts": "dev-master"
+        "drush/drush": "10.*@stable",
+        "goalgorilla/open_social": "dev-feature/3162491-group-update-d9",
+        "goalgorilla/open_social_scripts": "^2.0",
+        "drupal/redis": "^1.5",
+        "blackfire/php-sdk": "^v1.27.1"
     },
     "require-dev": {
-        "jcalderonzumba/gastonjs": "~1.0.2",
-        "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-        "mikey179/vfsstream": "~1.2",
-        "symfony/css-selector": "~2.8",
-        "behat/behat": "3.*@stable",
-        "behat/mink": "1.*@stable",
-        "behat/mink-extension": "*",
-        "behat/mink-goutte-driver": "*",
-        "behat/mink-selenium2-driver": "*",
-        "drupal/coder": "^8.3",
-        "drupal/drupal-extension": "^3.4",
-        "phpmd/phpmd": "@stable",
-        "sebastian/phpcpd": "@stable",
-        "phpunit/phpunit": "^6.5",
-        "phpunit/php-timer": "^1.0.9",
-        "drupal/console": "@stable",
-        "zaporylie/composer-drupal-optimizations": "^1.0",
-        "squizlabs/html_codesniffer": "*"
+        "dealerdirect/phpcodesniffer-composer-installer": "~0.7.1",
+        "drupal/coder": "8.3.13",
+        "drupal/composer_deploy": "^1.6",
+        "drupal/core-dev": "~9.1.0",
+        "drupal/devel": "^4.1",
+        "drupal/drupal-extension": "^4.1",
+        "drupal/upgrade_status": "^3.11",
+        "jcalderonzumba/gastonjs": "~1.2.0",
+        "jcalderonzumba/mink-phantomjs-driver": "~0.3.3",
+        "mglaman/phpstan-drupal": "^1.0",
+        "mikey179/vfsstream": "^1.6",
+        "palantirnet/drupal-rector": "3248684.x-dev",
+        "phpmd/phpmd": "^2.10",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "slevomat/coding-standard": "^7.0",
+        "squizlabs/html_codesniffer": "*",
+        "symplify/easy-coding-standard": "^9.4"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\socialblue\\": "html/profiles/contrib/social/themes/socialblue/src",
+            "Drupal\\socialbase\\": "html/profiles/contrib/social/themes/socialbase/src",
+            "Drupal\\bootstrap\\": "html/themes/contrib/bootstrap/src"
+        }
     },
     "repositories": {
         "0": {
@@ -40,24 +55,35 @@
             "type": "composer",
             "url": "https://asset-packagist.org"
         },
-        "3": {
+        "2": {
             "type": "package",
             "package": {
                 "name": "squizlabs/html_codesniffer",
-                "version": "1.0.0",
+                "version": "2.5.1",
                 "source": {
                     "url": "https://github.com/squizlabs/HTML_CodeSniffer.git",
                     "type": "git",
                     "reference": "master"
                 }
             }
         },
-        "social": {
+        "3": {
             "type": "git",
             "url": "https://github.com/goalgorilla/open_social.git",
             "only": ["goalgorilla/open_social", "drupal/social"]
+        },
+        "4": {
+            "type": "vcs",
+            "url": "https://github.com/bluehorndigital/drupal-rector.git",
+            "only": ["palantirnet/drupal-rector"]
         }
     },
+    "scripts": {
+        "refresh": [
+            "rm -rf composer.lock vendor html/core html/modules/contrib html/profiles/contrib html/themes/contrib",
+            "@composer update -W --ansi"
+        ]
+    },
     "extra": {
         "installer-types": [
             "bower-asset",
@@ -92,6 +118,9 @@
             ]
         },
         "enable-patching": true,
+        "patchLevel": {
+            "drupal/core": "-p2"
+        },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "html/"

diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -28,15 +28,14 @@ RUN docker-php-ext-configure gmp
 RUN docker-php-ext-install gmp
 
 # Xdebug.
-RUN pecl install xdebug-2.9.8 && \
+RUN pecl install xdebug-3.1.1 && \
     docker-php-ext-enable xdebug && \
-    sed -i '1 a xdebug.remote_autostart=true' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    sed -i '1 a xdebug.remote_mode=req' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    sed -i '1 a xdebug.remote_handler=dbgp' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    sed -i '1 a xdebug.remote_connect_back=1 ' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    sed -i '1 a xdebug.remote_port=9000' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    sed -i '1 a xdebug.remote_host=127.0.0.1' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    sed -i '1 a xdebug.remote_enable=1' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+    sed -i '1 a xdebug.client_port=9003' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+    sed -i '1 a xdebug.mode=debug' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+    sed -i '1 a xdebug.start_with_request=yes' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+    sed -i '1 a xdebug.discover_client_host=true' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+    sed -i '1 a xdebug.client_host=host.docker.internal' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+    sed -i '1 a xdebug.idekey=PHPSTORMi' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 # Blackfire
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \