netlify identity redirect

.github/actions/setup/action.yml

@@ -11,7 +11,7 @@ runs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.1'
+        php-version: '8.2'
 
     - uses: pnpm/action-setup@v2
       name: Install pnpm

.github/workflows/test.yml

@@ -73,7 +73,7 @@ jobs:
 
   docker_build:
     name: Docker Build
-    if: startsWith(github.head_ref, 'test-all/')
+    if: startsWith(github.ref_name, 'test-all/')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.gitpod.Dockerfile

@@ -1,26 +1,31 @@
 FROM gitpod/workspace-full
-RUN sudo update-alternatives --set php $(which php8.1)
-RUN sudo install-packages php8.1-gd php8.1-mbstring php8.1-curl php8.1-sqlite3 php8.1-zip php8.1-xdebug php8.1-imagick
+RUN sudo update-alternatives --set php $(which php8.2)
+RUN sudo install-packages php8.2-gd php8.2-mbstring php8.2-curl php8.2-sqlite3 php8.2-zip php8.2-xdebug php8.2-imagick
 RUN pnpx [email protected] install-deps
 RUN pnpx [email protected] install
 RUN npm install -g [email protected] @withgraphite/graphite-cli
 
-COPY .gitpod/xdebug.ini /etc/php/8.1/mods-available/xdebug.ini
+COPY .gitpod/xdebug.ini /etc/php/8.2/mods-available/xdebug.ini
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
 RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && \
-    echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && \
-    echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno
+  echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && \
+  echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno
 
 # Install neovim and helpers
 RUN wget https://github.com/neovim/neovim/releases/download/v0.9.2/nvim-linux64.tar.gz && \
-    tar xzf nvim-linux64.tar.gz && \
-    sudo mv nvim-linux64 /usr/local/nvim && \
-    sudo ln -s /usr/local/nvim/bin/nvim /usr/local/bin/nvim && \
-    rm -rf nvim-linux64.tar.gz
+  tar xzf nvim-linux64.tar.gz && \
+  sudo mv nvim-linux64 /usr/local/nvim && \
+  sudo ln -s /usr/local/nvim/bin/nvim /usr/local/bin/nvim && \
+  rm -rf nvim-linux64.tar.gz
 RUN sudo apt-get install -y fd-find
 RUN npm install -g neovim
 
+# Install phpactor
+RUN curl -Lo phpactor.phar https://github.com/phpactor/phpactor/releases/latest/download/phpactor.phar
+RUN chmod a+x phpactor.phar
+RUN sudo mv phpactor.phar /usr/local/bin/phpactor
+
 RUN curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_0.40.2_Linux_x86_64.tar.gz" \
-    && tar xf lazygit.tar.gz lazygit \
-    && sudo install lazygit /usr/local/bin
+  && tar xf lazygit.tar.gz lazygit \
+  && sudo install lazygit /usr/local/bin
 

.gitpod.yml

@@ -41,23 +41,6 @@ tasks:
 image:
   file: .gitpod.Dockerfile
 
-github:
-  prebuilds:
-    # enable for the default branch (defaults to true)
-    master: true
-    # enable for all branches in this repo (defaults to false)
-    branches: false
-    # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: false
-    # add a check to pull requests (defaults to true)
-    addCheck: true
-    # add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
-    addComment: false
-    # add a "Review in Gitpod" button to the pull request's description (defaults to false)
-    addBadge: false
-
 vscode:
   extensions:
     - 'esbenp.prettier-vscode'

.lagoon/Dockerfile

@@ -31,7 +31,7 @@ RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/website"
 # ====================================================================================================
 # CLI IMAGE
 # ====================================================================================================
-FROM uselagoon/php-8.1-cli-drupal as cli
+FROM uselagoon/php-8.2-cli-drupal as cli
 
 RUN apk add --no-cache git qpdf imagemagick icu-dev && \
   docker-php-ext-install intl && \
@@ -53,7 +53,7 @@ ENV WEBROOT=web
 # ====================================================================================================
 # PHP IMAGE
 # ====================================================================================================
-FROM uselagoon/php-8.1-fpm as php
+FROM uselagoon/php-8.2-fpm as php
 RUN apk add --no-cache imagemagick qpdf icu-dev && \
   docker-php-ext-install intl && \
   docker-php-ext-enable intl

apps/cms/composer.json

@@ -27,7 +27,7 @@
     }
   ],
   "require": {
-    "php": "^8.1 <8.2",
+    "php": "^8.2 <8.3",
     "amazeeio/drupal_integrations": "^0.3.7",
     "amazeelabs/default-content": "^1.2.11",
     "amazeelabs/graphql_directives": "^2.1",
@@ -45,14 +45,13 @@
     "amazeelabs/silverback_iframe_theme": "^1.2.3",
     "amazeelabs/silverback_publisher_monitor": "^2.3.2",
     "amazeelabs/silverback_translations": "^1.0.4",
-    "asm89/stack-cors": "2.0.5 as 1.3.0",
     "composer/installers": "^2.2",
     "drupal/admin_toolbar": "^3.4.1",
     "drupal/config_ignore": "^2.4",
     "drupal/config_notify": "^1.10",
     "drupal/config_pages": "^2.14",
-    "drupal/core-composer-scaffold": "^9.5.9",
-    "drupal/core-recommended": "^9.5.9",
+    "drupal/core-composer-scaffold": "^10",
+    "drupal/core-recommended": "^10",
     "drupal/dropzonejs": "^2.8",
     "drupal/entity_usage": "^2.0@beta",
     "drupal/environment_indicator": "^4.0.14",
@@ -73,7 +72,7 @@
     "drupal/stage_file_proxy": "^2.0.2",
     "drupal/userprotect": "^1.2",
     "drupal/webform": "^6.1.5",
-    "drush/drush": "^10.6.2",
+    "drush/drush": "^11",
     "enyo/dropzone": "^5.7.1"
   },
   "conflict": {
@@ -87,17 +86,18 @@
       "composer/installers": true,
       "cweagans/composer-patches": true,
       "drupal/core-composer-scaffold": true,
-      "dealerdirect/phpcodesniffer-composer-installer": true
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "phpstan/extension-installer": true
     }
   },
   "extra": {
     "patches": {
-      "drupal/core": {
-        "#2706241 AccessAwareRouter does not respect HTTP method": "https://www.drupal.org/files/issues/2023-03-17/2706241-74.patch"
-      },
       "drupal/config_ignore": {
         "#2857247 Do not export ignored config": "https://www.drupal.org/files/issues/2021-08-18/config_ignore_2857247-75.patch"
       },
+      "drupal/userprotect": {
+        "Fix site install": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch"
+      },
       "drupal/default_content": {
         "#3181075 Allow to alter exported fields": "https://www.drupal.org/files/issues/2022-11-07/default_content_hook_exported_fields-3181075-7.patch"
       }
@@ -155,7 +155,7 @@
     "composer-exit-on-patch-failure": true
   },
   "require-dev": {
-    "drupal/core-dev": "^9.5.9",
+    "drupal/core-dev": "^10",
     "phpspec/prophecy-phpunit": "^2.0.2"
   }
 }