Merge pull request #365 from goalgorilla/issue/3260861-php8-support

Added PHP 8.0 support.
goalgorilla · Jun 16, 2022 · 78be0ec · 78be0ec
2 parents 7666c45 + 9fa3021
commit 78be0ec
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: focal
 sudo: required
 
 cache:
@@ -14,12 +14,18 @@ addons:
 language: php
 
 php:
-  - 7.4
+  - 8.0
+
+env:
+  global:
+    # Travis Token.
+    secure: "u6jLZiftQdb8Ozxngu5sgwmnXeUyvNF3/Y+5eX3+Xyb7Sm6K++cBLbYl/zNbuzp1rZE5dn3pVTQc4tstVXZw2B5KjCd64r9HE9gdwCEnS/AA/w3wGlaEBinTzKOrrN1EvqNNhnJUY2JmqEYVom+UYwLZWIIKM/5OoaeidNqHDvImZZLAeYfPMGnySsFC01yCzrOn6jv8Bwu00dQPVEOQylVEV5qgdGYz6CvGGslcvGxhvR0qdY/IXhrA0yxIk1yA6vu1mQpCSjGpPLy024JhcqRr3AzjH2N0QRKlL7vcNFxl/OC0qcK2bOl8lcQydeC5LRp92eeCLfMfvqHDqLJKvebCsvaZSmqlzCURlcHaJOM5bce7XPVyNLdwnfppgSacocGol38qxfEc09qV4AZnklwigYCfnk346oSaocKApy48KRW4cNXL45U7+z10IzVAENGwbyyuwdvKHhDtMCgMd8eeYfRF5EvENOKVSG02Kca8X2fLBhmJsXkFcBEW7pSRZKxixkIkuAwEYSQW/lvvM4LJmd2np7vZDEMh1dmf7TBRBygDVmM7vtdYRSzivR/T9nH+mXPP9FcjVvlPPeWAEaqtLPmmONmYRjDRcoHjJh3YnSMpvVs8wejDf7iS6A44cI6xZQRoEoCFA/WUu5EnzmoOCY7HvZ62xnZ0I9nNyL4="
 
 services:
   - docker
 
 before_install:
+  - set -e
   # Composer Configurations.
   - export COMPOSER_MEMORY_LIMIT=-1 # Set php memory limit to -1 so composer update will not fail
   - export COMPOSER_EXIT_ON_PATCH_FAILURE=1 # To enforce throwing an error and stopping package installation/update immediately

diff --git a/composer.json b/composer.json
@@ -25,13 +25,13 @@
         "drupal/redis": "^1.5",
         "drush/drush": "11.*@stable",
         "goalgorilla/open_social": "dev-main",
-        "goalgorilla/open_social_scripts": "^3.0"
+        "goalgorilla/open_social_scripts": "^3.1"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "~0.7.1",
         "drupal/coder": "^8.3",
         "drupal/composer_deploy": "^1.6",
-        "drupal/core-dev": "~9.3.12",
+        "drupal/core-dev": "~9.3.15",
         "drupal/devel": "^4.1",
         "drupal/drupal-extension": "^4.1",
         "drupal/upgrade_status": "^3.11",

diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -1,3 +1,5 @@
+# See: https://docs.docker.com/compose/compose-file/
+# See: https://github.com/compose-spec/compose-spec/blob/master/spec.md
 version: "2"
 
 services:
@@ -34,7 +36,7 @@ services:
     volumes:
       - db_data:/var/lib/mysql
     ports:
-      - "3307:3306"
+      - "3306"
     container_name: social_ci_db
     command: mysqld --max_allowed_packet=16M
 

diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml
@@ -1,11 +1,9 @@
-version: "2"
-
 services:
   web:
     image: goalgorilla/open_social_docker:dev
     volumes:
      - ./:/var/www:delegated
-    links:
+    depends_on:
      - db
      - mailcatcher
      - redis
@@ -46,8 +44,8 @@ services:
     image: selenium/standalone-firefox-debug:2.48.2
     volumes:
       - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated
-    links:
-     - web:web
+    depends_on:
+     - web
     ports:
      - "4444"
      - "5900"
@@ -61,10 +59,10 @@ services:
     image: goalgorilla/open_social_docker:dev
     volumes:
      - ./:/var/www:delegated
-    links:
-     - web:web
-     - db:db
-     - selenium:selenium
+    depends_on:
+     - web
+     - db
+     - selenium
     environment:
      - DRUPAL_SETTINGS=development
     network_mode: "bridge"
@@ -85,7 +83,7 @@ services:
     image: goalgorilla/open_social_docker:cron
     volumes:
      - ./:/var/www
-    links:
+    depends_on:
      - db
      - mailcatcher
     environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,3 +1,5 @@
+# See: https://docs.docker.com/compose/compose-file/
+# See: https://github.com/compose-spec/compose-spec/blob/master/spec.md
 services:
   web:
     image: goalgorilla/open_social_docker:dev

diff --git a/rector.php b/rector.php
@@ -24,7 +24,7 @@
   //   Should we try and load \Drupal::VERSION and check?
   $containerConfigurator->import(__DIR__ . '/vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8-all-deprecations.php');
   $containerConfigurator->import(__DIR__ . '/vendor/palantirnet/drupal-rector/config/drupal-9/drupal-9-all-deprecations.php');
-  $containerConfigurator->import(SetList::PHP_74);
+  $containerConfigurator->import(SetList::PHP_80);
   $parameters = $containerConfigurator->parameters();
 
   $drupalFinder = new DrupalFinder();
@@ -37,7 +37,7 @@
     $drupalRoot . '/themes',
   ]);
 
-  $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74);
+  $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80);
   $parameters->set(Option::SKIP, ['*/upgrade_status/tests/modules/*']);
   $parameters->set(Option::FILE_EXTENSIONS, ['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']);
   $parameters->set(Option::AUTO_IMPORT_NAMES, TRUE);