Merge pull request cakephp#2100 from cakephp/0.next-merge

Author: MasterOdin

.github/dependabot.yml

@@ -3,5 +3,10 @@ updates:
 - package-ecosystem: composer
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
   open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -1,20 +1,28 @@
 name: CI
 
-on: ['push', 'pull_request']
+on:
+  push:
+    branches:
+      - '0.x'
+      - '0.next'
+      - '1.x'
+  pull_request:
 
 jobs:
   testsuite:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '8.0', '8.1']
+        php-version: ['7.2', '7.4', '8.0', '8.1']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
         include:
+          - php-version: '8.2'
+            db-type: mysql
           - php-version: '7.2'
-            db-type: 'mysql'
-            prefer-lowest: 'prefer-lowest'
+            db-type: mysql
+            prefer-lowest: prefer-lowest
 
     steps:
     - name: Setup MySQL latest
@@ -33,7 +41,7 @@ jobs:
       if: matrix.db-type == 'pgsql' && matrix.php-version == '7.2'
       run: docker run --rm --name=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=cakephp -p 5432:5432 -d postgres:9.4
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -50,14 +58,14 @@ jobs:
       run: echo "::set-output name=date::$(date +'%Y-%m')"
 
     - name: Cache composer dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
 
     - name: Composer install
       run: |
-        if [[ ${{ matrix.php-version }} == '8.1' ]]; then
+        if [[ ${{ matrix.php-version }} == '8.2' ]]; then
           composer install --ignore-platform-req=php
         elif ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
           composer update --prefer-lowest --prefer-stable
@@ -89,26 +97,30 @@ jobs:
         if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export MYSQL_DSN='mysql://root:[email protected]/phinx'; fi
         if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export PGSQL_DSN='pgsql://postgres:[email protected]/phinx'; fi
 
-        if [[ ${{ matrix.php-version }} == '8.0' ]]; then
+        if [[ ${{ matrix.php-version }} == '8.1' ]]; then
           export CODECOVERAGE=1 && vendor/bin/phpunit --verbose --coverage-clover=coverage.xml
         else
           vendor/bin/phpunit
         fi
 
+    - name: Prefer lowest check
+      if: matrix.prefer-lowest == 'prefer-lowest'
+      run: composer require --dev dereuromark/composer-prefer-lowest && vendor/bin/validate-prefer-lowest -m
+
     - name: Submit code coverage
-      if: matrix.php-version == '8.0'
-      uses: codecov/codecov-action@v1
+      if: matrix.php-version == '8.1'
+      uses: codecov/codecov-action@v3
 
   testsuite-windows:
     runs-on: windows-2019
-    name: Windows - PHP 7.4 & SQL Server
+    name: Windows - PHP 8.1 & SQL Server
 
     env:
       EXTENSIONS: pdo_sqlsrv
-      PHP_VERSION: '7.4'
+      PHP_VERSION: '8.1'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Get date part for cache key
       id: key-date
@@ -123,7 +135,7 @@ jobs:
         key: ${{ steps.key-date.outputs.date }}
 
     - name: Cache PHP extensions
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ${{ steps.php-ext-cache.outputs.dir }}
         key: ${{ runner.os }}-php-ext-${{ steps.php-ext-cache.outputs.key }}
@@ -149,7 +161,7 @@ jobs:
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Cache composer dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
@@ -165,19 +177,19 @@ jobs:
           vendor/bin/phpunit --verbose --coverage-clover=coverage.xml
 
     - name: Submit code coverage
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
 
   cs-stan:
     name: Coding Standard & Static Analysis
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.4'
         coverage: none
 
     - name: Get composer cache directory
@@ -189,7 +201,7 @@ jobs:
       run: echo "::set-output name=date::$(date +'%Y-%m')"
 
     - name: Cache composer dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}
@@ -201,4 +213,5 @@ jobs:
       run: vendor/bin/phpcs --report=checkstyle -np app/ src/ tests/
 
     - name: Run phpstan
+      if: always()
       run: vendor/bin/phpstan.phar analyse --error-format=github

.github/workflows/deploy_docs_0x.yml

@@ -0,0 +1,28 @@
+---
+name: 'deploy_docs_0x'
+
+on:
+  push:
+    tags:
+      - v0.*
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: Branch to run on
+        default: master
+        required: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cloning repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Push to dokku
+        uses: dokku/github-action@master
+        with:
+          git_remote_url: 'ssh://[email protected]:22/phinx-docs'
+          ssh_private_key: ${{ secrets.DOKKU_SSH_PRIVATE_KEY }}

.github/workflows/phar.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -22,7 +22,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

composer.json

@@ -2,34 +2,45 @@
     "name": "robmorgan/phinx",
     "type": "library",
     "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.",
-    "keywords": ["phinx", "migrations", "database", "db", "database migrations"],
+    "keywords": [
+        "phinx",
+        "migrations",
+        "database",
+        "db",
+        "database migrations"
+    ],
     "homepage": "https://phinx.org",
     "license": "MIT",
-    "authors": [{
-        "name": "Rob Morgan",
-        "email": "[email protected]",
-        "homepage": "https://robmorgan.id.au",
-        "role": "Lead Developer"
-    }, {
-        "name": "Woody Gilk",
-        "email": "[email protected]",
-        "homepage": "https://shadowhand.me",
-        "role": "Developer"
-    }, {
-        "name": "Richard Quadling",
-        "email": "[email protected]",
-        "role": "Developer"
-    }, {
-        "name": "CakePHP Community",
-        "role": "Developer",
-        "homepage": "https://github.com/cakephp/phinx/graphs/contributors"
-    }],
+    "authors": [
+        {
+            "name": "Rob Morgan",
+            "email": "[email protected]",
+            "homepage": "https://robmorgan.id.au",
+            "role": "Lead Developer"
+        },
+        {
+            "name": "Woody Gilk",
+            "email": "[email protected]",
+            "homepage": "https://shadowhand.me",
+            "role": "Developer"
+        },
+        {
+            "name": "Richard Quadling",
+            "email": "[email protected]",
+            "role": "Developer"
+        },
+        {
+            "name": "CakePHP Community",
+            "role": "Developer",
+            "homepage": "https://github.com/cakephp/phinx/graphs/contributors"
+        }
+    ],
     "require": {
         "php": ">=7.2",
         "cakephp/database": "^4.0",
         "psr/container": "^1.0 || ^2.0",
-        "symfony/console": "^3.4|^4.0|^5.0",
-        "symfony/config": "^3.4|^4.0|^5.0"
+        "symfony/console": "^3.4|^4.0|^5.0|^6.0",
+        "symfony/config": "^3.4|^4.0|^5.0|^6.0"
     },
     "require-dev": {
         "ext-json": "*",
@@ -62,8 +73,15 @@
         "cs-check": "phpcs -np app/ src/ tests/",
         "cs-fix": "phpcbf -np app/ src/ tests/",
         "stan": "phpstan analyse src/",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.5.0 && mv composer.backup composer.json",
         "test": "phpunit --colors=always"
     },
-    "bin": ["bin/phinx"]
+    "bin": [
+        "bin/phinx"
+    ],
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }

docs.Dockerfile

@@ -5,12 +5,18 @@ COPY docs /data/docs
 
 # Build docs with sphinx
 RUN cd /data/docs-builder && \
-  make website LANGS="en es fr ja" SOURCE=/data/docs DEST=/data/website
+  make website LANGS="en" SOURCE=/data/docs DEST=/data/website
 
 
 # Build a small nginx container with just the static site in it.
-FROM nginx:1.15-alpine
+FROM markstory/cakephp-docs-builder:runtime as runtime
 
+# Configure search index script
+ENV LANGS="en"
+ENV SEARCH_SOURCE="/usr/share/nginx/html"
+ENV SEARCH_URL_PREFIX="/phinx/0"
+
+COPY --from=builder /data/docs /data/docs
 COPY --from=builder /data/website /data/website
 COPY --from=builder /data/docs-builder/nginx.conf /etc/nginx/conf.d/default.conf
 

docs/config/all.py

@@ -25,7 +25,7 @@
 ]
 
 # Languages available.
-languages = ['en', 'es', 'fr', 'ja']
+languages = ['en']
 
 # The GitHub branch name for this version of the docs
 # for edit links to point at.

docs/en/configuration.rst

@@ -323,9 +323,9 @@ specified directly as connection options.
         default_migration_table: phinxlog
         default_environment: development
         development:
-            dsn: %%DATABASE_URL%%
+            dsn: '%%DATABASE_URL%%'
         production:
-            dsn: %%DATABASE_URL%%
+            dsn: '%%DATABASE_URL%%'
             name: production_database
 
 If the supplied DSN is invalid, then it is completely ignored.
@@ -391,6 +391,18 @@ Declaring an SQLite database uses a simplified structure:
             adapter: sqlite
             memory: true     # Setting memory to *any* value overrides name
 
+Starting with PHP 8.1 the SQlite adapter supports ``cache`` and ``mode``
+query parameters by using the `URI scheme <https://www.sqlite.org/uri.html>`_ as long as ``open_basedir`` is unset.
+
+.. code-block:: yaml
+
+    environments:
+        testing:
+            adapter: sqlite
+            name: my_app
+            mode: memory     # Determines if the new database is opened read-only, read-write, read-write and created if it does not exist, or that the database is a pure in-memory database that never interacts with disk, respectively.
+            cache: shared    # Determines if the new database is opened using shared cache mode or with a private cache.
+
 SQL Server
 `````````````````
 

docs/en/contents.rst

@@ -2,7 +2,6 @@ Contents
 ########
 
 .. toctree::
-   :maxdepth: 2
    :caption: Phinx
 
    intro

docs/en/index.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 Phinx Documentation
 ===================