Merge branch '0.next' into master

.appveyor.yml

@@ -0,0 +1,52 @@
+build: false
+platform: 'x64'
+clone_folder: C:\projects\phinx
+clone_depth: 10
+
+environment:
+  TESTS_PHINX_DB_ADAPTER_SQLSRV_ENABLED: true
+  TESTS_PHINX_DB_ADAPTER_SQLSRV_HOST: localhost
+  TESTS_PHINX_DB_ADAPTER_SQLSRV_USERNAME: sa
+  TESTS_PHINX_DB_ADAPTER_SQLSRV_PASSWORD: Password12!
+  TESTS_PHINX_DB_ADAPTER_SQLSRV_DATABASE: phinxtesting
+  TESTS_PHINX_DB_ADAPTER_SQLSRV_PORT: 1433
+
+services:
+  - mssql2012sp1
+
+cache:
+  - '%LOCALAPPDATA%\Composer\files'
+
+init:
+  - SET PATH=C:\Program Files\OpenSSL;c:\php;%PATH%
+  - SET COMPOSER_NO_INTERACTION=1
+  - SET ANSICON=121x90 (121x90)
+
+install:
+  - curl -fsS https://windows.php.net/downloads/releases/latest/php-7.2-nts-Win32-VC15-x64-latest.zip -o php.zip
+  - curl -fsS https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/5.6.1/php_pdo_sqlsrv-5.6.1-7.2-nts-vc15-x64.zip -o pdosqlsrv.zip
+  - curl -fsS https://windows.php.net/downloads/pecl/releases/sqlsrv/5.6.1/php_sqlsrv-5.6.1-7.2-nts-vc15-x64.zip -o sqlsrv.zip
+  - 7z x php.zip -oC:\php\ -aoa > nul
+  - 7z x pdosqlsrv.zip -oC:\php\ext php_pdo_sqlsrv.dll -aoa > nul
+  - 7z x sqlsrv.zip -oC:\php\ext php_sqlsrv.dll -aoa > nul
+
+  - cd C:\php
+  - copy php.ini-production php.ini /Y
+  - echo date.timezone="UTC" >> php.ini
+  - echo extension_dir=ext >> php.ini
+  - echo extension=openssl >> php.ini
+  - echo extension=mbstring >> php.ini
+  - echo extension=intl >> php.ini
+  - echo extension=pdo_sqlsrv >> php.ini
+  - echo extension=sqlsrv >> php.ini
+  - php -v
+
+  - cd C:\projects\phinx
+  - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
+  - php composer.phar update --no-progress
+  - php composer.phar show
+
+test_script:
+  - sqlcmd -S localhost,1433 -U sa -P Password12! -Q "create database phinxtesting;"
+  - cd c:\projects\phinx
+  - vendor\bin\phpunit --no-configuration --bootstrap tests\phpunit-bootstrap.php tests\

.travis.yml

@@ -10,8 +10,7 @@ services:
   - mysql
 
 php:
-  - 5.6
-  - 7.0
+  - 7.2
   - 7.4
 
 env:
@@ -20,13 +19,13 @@ env:
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.2
       env: PREFER_LOWEST=1
 
     - php: 7.2
       env: PHPCS=1 DEFAULT=0
 
-    - php: 7.1
+    - php: 7.2
       env: PHPSTAN=1 DEFAULT=0
 
 before_install:
@@ -40,11 +39,11 @@ before_script:
     - if [[ $DEFAULT = 1 ]]; then psql -c 'create extension if not exists citext;' -U postgres; fi
 
     - if [[ $PHPCS = 1 ]]; then composer require --dev squizlabs/php_codesniffer:^3.1.1; fi
-    - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9; fi
+    - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.12; fi
 
 script:
     - if [[ $DEFAULT = 1 ]]; then vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover; fi
-    - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -c phpstan.neon -l 4 src/; fi
+    - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -c phpstan.neon src/; fi
     - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -p -s src/; fi
 
 after_success:

README.md

@@ -4,6 +4,7 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/9vag4892hfq6effr)](https://ci.appveyor.com/project/robmorgan/phinx)
 [![Code Coverage](https://codecov.io/gh/cakephp/phinx/branch/master/graph/badge.svg)](https://codecov.io/gh/cakephp/phinx)
 [![Latest Stable Version](https://poser.pugx.org/robmorgan/phinx/version.png)](https://packagist.org/packages/robmorgan/phinx)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg)](https://php.net/)
 [![Total Downloads](https://poser.pugx.org/robmorgan/phinx/d/total.png)](https://packagist.org/packages/robmorgan/phinx)
 [![Join the chat at https://gitter.im/phinx-php/Lobby](https://badges.gitter.im/phinx-php/Lobby.svg)](https://gitter.im/phinx-php/Lobby)
 
@@ -37,6 +38,8 @@ Phinx natively supports the following database adapters:
 
 ## Install & Run
 
+See [version and branch overview](https://github.com/cakephp/phinx/wiki#version-and-branch-overview) for branch and PHP compatibility.
+
 ### Composer
 
 The fastest way to install Phinx is to add it to your project using Composer (https://getcomposer.org/).

composer.json

@@ -25,15 +25,15 @@
         "homepage": "https://github.com/cakephp/phinx/graphs/contributors"
     }],
     "require": {
-        "php": ">=5.6",
-        "cakephp/collection": "^3.7",
-        "cakephp/database": "^3.7",
+        "php": ">=7.2",
+        "cakephp/collection": "^4.0",
+        "cakephp/database": "^4.0",
         "symfony/console": "^3.4|^4.0|^5.0",
         "symfony/config": "^3.4|^4.0|^5.0"
     },
     "require-dev": {
         "ext-json": "*",
-        "phpunit/phpunit": ">=5.7,<8.0",
+        "phpunit/phpunit": "^8.5",
         "sebastian/comparator": ">=1.2.3",
         "cakephp/cakephp-codesniffer": "^3.0",
         "symfony/yaml": "^3.4|^4.0|^5.0"
@@ -59,6 +59,8 @@
         ],
         "cs-check": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=/tests/Phinx/Config/_rootDirectories/,/tests/log/ src/ tests/ app/",
         "cs-fix": "phpcbf --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=/tests/Phinx/Config/_rootDirectories/,/tests/log/ src/ tests/ app/",
+        "stan": "phpstan analyse src/",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 && mv composer.backup composer.json",
         "test": "phpunit --colors=always"
     },
     "bin": ["bin/phinx"]

docs/config/all.py

@@ -8,7 +8,7 @@
 from cakephpsphinx.config.all import *
 
 # The full version, including alpha/beta/rc tags.
-release = '0.11.x'
+release = '0.12.x'
 
 # The search index version.
 search_version = 'phinx-0'

docs/en/commands.rst

@@ -247,7 +247,7 @@ configuration file may be the computed output of a PHP file as a PHP array:
                 ],
                 "environments" => [
                     "default_migration_table" => "phinxlog",
-                    "default_database" => "dev",
+                    "default_environment" => "dev",
                     "dev" => [
                         "adapter" => "mysql",
                         "host" => $_ENV['DB_HOST'],
@@ -275,7 +275,7 @@ the database name too, as Phinx requires this for certain methods such as ``hasT
                 ),
                 "environments" => [
                     "default_migration_table" => "phinxlog",
-                    "default_database" => "dev",
+                    "default_environment" => "dev",
                     "dev" => [
                         "name" => "dev_db",
                         "connection" => $pdo_instance

docs/en/configuration.rst

@@ -40,7 +40,7 @@ This means that:
 
     return [
         'environments' => [
-            'default_database' => 'development',
+            'default_environment' => 'development',
             'development' => [
                 'name' => 'devdb',
                 'connection' => $pdo
@@ -151,7 +151,7 @@ specified under the ``environments`` nested collection. For example:
 
     environments:
         default_migration_table: phinxlog
-        default_database: development
+        default_environment: development
         production:
             adapter: mysql
             host: localhost
@@ -204,7 +204,7 @@ network connections. The socket path is configured with ``unix_socket``:
 
     environments:
         default_migration_table: phinxlog
-        default_database: development
+        default_environment: development
         production:
             adapter: mysql
             name: production_db
@@ -228,7 +228,7 @@ demonstrated by the following example:
 
     environments:
         default_migration_table: phinxlog
-        default_database: development
+        default_environment: development
         production:
             adapter: mysql
             host: '%%PHINX_DBHOST%%'
@@ -261,7 +261,7 @@ projects (Doctrine, Rails, AMQP, PaaS, etc).
 
     environments:
         default_migration_table: phinxlog
-        default_database: development
+        default_environment: development
         production:
             # Example data source name
             dsn: mysql://root@localhost:3306/mydb?charset=utf8
@@ -274,7 +274,7 @@ specified directly as connection options.
 
     environments:
         default_migration_table: phinxlog
-        default_database: development
+        default_environment: development
         development:
             dsn: %%DATABASE_URL%%
         production:

docs/en/install.rst

@@ -5,12 +5,12 @@ Installation
 ============
 
 Phinx should be installed using Composer, which is a tool for dependency
-management in PHP. Please visit the `Composer <https://getcomposer.org/>`_ 
+management in PHP. Please visit the `Composer <https://getcomposer.org/>`_
 website for more information.
 
 .. note::
 
-    Phinx requires at least PHP 5.6 (or later).
+    Phinx requires at least PHP 7.2 (or later).
 
 To install Phinx, simply require it using Composer: