Skip to content

Commit

Permalink
Merge pull request #56 from youvo/upgrade
Browse files Browse the repository at this point in the history 
Drupal 9.5
  • Loading branch information
@simonbaese
simonbaese authored Apr 16, 2023
2 parents b97ff6f + 062f3bb commit 8c97700
Show file tree
Hide file tree
Showing 25 changed files with 2,579 additions and 3,477 deletions.
16 changes: 8 additions & 8 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
Expand Down
49 changes: 25 additions & 24 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,26 @@
"composer/installers": "^1.12",
"cweagans/composer-patches": "^1.7",
"drupal/consumer_image_styles": "^4.0",
"drupal/core": "^9.4",
"drupal/core-composer-scaffold": "9.4.*",
"drupal/core-project-message": "9.4.*",
"drupal/core-recommended": "9.4.*",
"drupal/core-vendor-hardening": "9.4.*",
"drupal/entity": "^1.3",
"drupal/core": "^9.5",
"drupal/core-composer-scaffold": "^9.5",
"drupal/core-project-message": "^9.5",
"drupal/core-recommended": "^9.5",
"drupal/core-vendor-hardening": "^9.5",
"drupal/entity": "^1.4",
"drupal/filefield_paths": "^1.0@beta",
"drupal/image_style_warmer": "^1.1",
"drupal/imagemagick": "^3.3",
"drupal/image_style_warmer": "^1.2",
"drupal/imagemagick": "^3.4",
"drupal/jsonapi_boost": "^2.0",
"drupal/jsonapi_cross_bundles": "^1.0",
"drupal/jsonapi_extras": "^3.20",
"drupal/jsonapi_include": "^1.4",
"drupal/mail_login": "^2.6",
"drupal/jsonapi_extras": "^3.23",
"drupal/jsonapi_include": "^1.6",
"drupal/mail_login": "^2.7",
"drupal/multivalue_form_element": "^1.0@beta",
"drupal/simple_oauth": "^5.2",
"drupal/subrequests": "^3.0",
"drupal/user_bundle": "^1.1",
"drush/drush": "^10.6"
"drupal/upgrade_status": "^4.0",
"drupal/user_bundle": "^1.2",
"drush/drush": "^11.5"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -115,7 +116,7 @@
"enable-patching": true,
"patchLevel": {
"drupal/core": "-p2",
"drupal/simple_oauth": "-p4",
"drupal/simple_oauth": "-p1",
"drupal/image_style_warmer": "-p4",
"drupal/jsonapi_include": "-p4",
"drupal/jsonapi_boost": "-p4",
Expand All @@ -129,25 +130,25 @@
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"drupal/admin_toolbar": "^3.0",
"drupal/admin_toolbar": "^3.3",
"drupal/coder": "^8.3",
"drupal/core-dev": "9.4.*",
"drupal/devel": "^4.1",
"drupal/core-dev": "^9.5",
"drupal/devel": "^5.1",
"drupal/devel_mail_logger": "^1.0@beta",
"drupal/druqs": "2.0.x-dev@dev",
"drupal/mailsystem": "^4.3",
"drupal/openapi": "^2.0",
"drupal/mailsystem": "^4.4",
"drupal/openapi": "^2.1",
"drupal/openapi_jsonapi": "^3.0",
"drupal/openapi_ui": "^1.0@RC",
"drupal/openapi_ui_redoc": "^1.0@RC",
"drupal/restui": "^1.20",
"fakerphp/faker": "^1.19",
"drupal/restui": "^1.21",
"fakerphp/faker": "^1.21",
"mglaman/phpstan-drupal": "^1.1",
"phpcompatibility/php-compatibility": "^9.3",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-deprecation-rules": "^1.0"
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-deprecation-rules": "^1.1"
},
"scripts": {
"post-drupal-scaffold-cmd": [
Expand Down
Loading

0 comments on commit 8c97700

Please sign in to comment.