Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating dependencies in favor of Drupal 9 compatiblity #362

Merged
merged 14 commits into from
Dec 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ addons:
language: php

php:
- 7.3
- 7.4

services:
- docker
Expand Down
56 changes: 33 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,38 @@
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"optimize-autoloader": true,
"update-with-dependencies": true,
"sort-packages": true
},
"require": {
"roave/security-advisories": "dev-master",
"drush/drush": "10.*@stable",
"goalgorilla/open_social": "dev-main",
"goalgorilla/open_social": "dev-feature/3162491-group-update-d9",
"goalgorilla/open_social_scripts": "^2.0",
"drupal/redis": "^1.2",
"blackfire/php-sdk": "^1.19"
"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.11",
"dealerdirect/phpcodesniffer-composer-installer": "~0.6 || ~0.7",
"drupal/drupal-extension": "^3.4",
"phpmd/phpmd": "@stable",
"phpunit/phpunit": "^7.5",
"drupal/console": "@stable",
"zaporylie/composer-drupal-optimizations": "^1.0",
"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": "^0.12.0",
"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": "*",
"mglaman/drupal-check": "^1.0",
"palantirnet/drupal-rector": "^0.5.6"
"symplify/easy-coding-standard": "^9.4"
},
"autoload": {
"psr-4": {
Expand All @@ -55,7 +59,7 @@
"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",
Expand All @@ -69,6 +73,12 @@
"only": ["goalgorilla/open_social", "drupal/social"]
}
},
"scripts": {
"refresh": [
"rm -rf composer.lock vendor html/core html/modules/contrib html/profiles/contrib html/themes/contrib",
"@composer update -W --ansi"
]
},
Comment on lines +76 to +81
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@navneet0693 Perhaps we can remove this since it's a command waiting for disaster for developers who do not grasp exactly what it does.

Your working copy of Open Social and themes will both be in html/*/contrib and so this command will also throw those away along with your local copy of git. This means that if you have unpushed work or unstaged changes, those changes will be gone.

"extra": {
"installer-types": [
"bower-asset",
Expand Down
8 changes: 4 additions & 4 deletions docker-compose-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
container_name: social_ci_web

db:
image: mariadb:10.2
image: mariadb:10.7
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=social
Expand All @@ -52,7 +52,7 @@ services:
container_name: social_mailcatcher

selenium:
image: selenium/standalone-firefox:2.48.2
image: selenium/standalone-firefox-debug:2.48.2
links:
- web:web
volumes:
Expand Down Expand Up @@ -81,11 +81,11 @@ services:
container_name: social_ci_behat

solr:
image: solr:6.6
image: solr:8.11
hostname: solr
volumes:
- os_solr_data:/opt/solr/server/solr/mycores
- ./docker/solr/6.x/drupal/:/solr-conf/conf:cached
- ./docker/solr/8.x/drupal/:/solr-conf/conf:cached
environment:
- SOLR_SOLR_MEM_SIZE=512m
- PARTIAL_SEARCH_ENABLED=false
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.blackfire.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
container_name: social_web

db:
image: mariadb:10.2
image: mariadb:10.7
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=social
Expand Down Expand Up @@ -94,11 +94,11 @@ services:
container_name: social_cron

solr:
image: solr:6.6
image: solr:8.11
hostname: solr
volumes:
- os_solr_data:/opt/solr/server/solr/mycores
- ./docker/solr/6.x/drupal/:/solr-conf/conf:cached
- ./docker/solr/8.x/drupal/:/solr-conf/conf:cached
environment:
- SOLR_SOLR_MEM_SIZE=512m
- PARTIAL_SEARCH_ENABLED=false
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
container_name: social_web

db:
image: mariadb:10.2
image: mariadb:10.7
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=social
Expand Down Expand Up @@ -82,11 +82,11 @@ services:
container_name: social_cron

solr:
image: solr:6.6
image: solr:8.11
hostname: solr
volumes:
- os_solr_data:/opt/solr/server/solr/mycores
- ./docker/solr/6.x/drupal/:/solr-conf/conf:cached
- ./docker/solr/8.x/drupal/:/solr-conf/conf:cached
environment:
- SOLR_SOLR_MEM_SIZE=512m
- PARTIAL_SEARCH_ENABLED=false
Expand Down
164 changes: 164 additions & 0 deletions docker/solr/8.x/drupal/accents_en.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
# À => A
"\u00C0" => "A"
# Á => A
"\u00C1" => "A"
# Â => A
"\u00C2" => "A"
# Ã => A
"\u00C3" => "A"
# Ä => A
"\u00C4" => "A"
# Å => A
"\u00C5" => "A"
# Ą => A
"\u0104" => "A"
# Æ => AE
"\u00C6" => "AE"
# Ç => C
"\u00C7" => "C"
# Ć => C
"\U0106" => "C"
# È => E
"\u00C8" => "E"
# É => E
"\u00C9" => "E"
# Ê => E
"\u00CA" => "E"
# Ë => E
"\u00CB" => "E"
# Ę => E
"\u0118" => "E"
# Ì => I
"\u00CC" => "I"
# Í => I
"\u00CD" => "I"
# Î => I
"\u00CE" => "I"
# Ï => I
"\u00CF" => "I"
# IJ => IJ
"\u0132" => "IJ"
# Ð => D
"\u00D0" => "D"
# Ł => L
"\u0141" => "L"
# Ñ => N
"\u00D1" => "N"
# Ń => N
"\u0143" => "N"
# Ò => O
"\u00D2" => "O"
# Ó => O
"\u00D3" => "O"
# Ô => O
"\u00D4" => "O"
# Õ => O
"\u00D5" => "O"
# Ö => O
"\u00D6" => "O"
# Ø => O
"\u00D8" => "O"
# Œ => OE
"\u0152" => "OE"
# Þ
"\u00DE" => "TH"
# Ù => U
"\u00D9" => "U"
# Ú => U
"\u00DA" => "U"
# Û => U
"\u00DB" => "U"
# Ü => U
"\u00DC" => "U"
# Ý => Y
"\u00DD" => "Y"
# Ÿ => Y
"\u0178" => "Y"
# à => a
"\u00E0" => "a"
# á => a
"\u00E1" => "a"
# â => a
"\u00E2" => "a"
# ã => a
"\u00E3" => "a"
# ä => a
"\u00E4" => "a"
# å => a
"\u00E5" => "a"
# æ => ae
"\u00E6" => "ae"
# ç => c
"\u00E7" => "c"
# è => e
"\u00E8" => "e"
# é => e
"\u00E9" => "e"
# ê => e
"\u00EA" => "e"
# ë => e
"\u00EB" => "e"
# ì => i
"\u00EC" => "i"
# í => i
"\u00ED" => "i"
# î => i
"\u00EE" => "i"
# ï => i
"\u00EF" => "i"
# ij => ij
"\u0133" => "ij"
# ð => d
"\u00F0" => "d"
# ñ => n
"\u00F1" => "n"
# ò => o
"\u00F2" => "o"
# ó => o
"\u00F3" => "o"
# ô => o
"\u00F4" => "o"
# õ => o
"\u00F5" => "o"
# ö => o
"\u00F6" => "o"
# ø => o
"\u00F8" => "o"
# œ => oe
"\u0153" => "oe"
# ß => ss
"\u00DF" => "ss"
# Ś => S
"\u015a" => "S"
# þ => th
"\u00FE" => "th"
# ù => u
"\u00F9" => "u"
# ú => u
"\u00FA" => "u"
# û => u
"\u00FB" => "u"
# ü => u
"\u00FC" => "u"
# ý => y
"\u00FD" => "y"
# ÿ => y
"\u00FF" => "y"
# Ź => Z
"\u0179" => "Z"
# Ż => Z
"\u017b" => "Z"
# ff => ff
"\uFB00" => "ff"
# fi => fi
"\uFB01" => "fi"
# fl => fl
"\uFB02" => "fl"
# ffi => ffi
"\uFB03" => "ffi"
# ffl => ffl
"\uFB04" => "ffl"
# ſt => st
"\uFB05" => "st"
# st => st
"\uFB06" => "st"
Loading