Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/4.3.x' into 5.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
greg0ire committed Jan 13, 2025
2 parents 22f86e6 + 4946758 commit 7fd5074
Show file tree
Hide file tree
Showing 28 changed files with 749 additions and 281 deletions.
4 changes: 3 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ install:
$destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip"
Invoke-WebRequest $source -OutFile $destination
7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip > $null
$DLLVersion = (Invoke-WebRequest "https://pecl.php.net/rest/r/pcov/stable.txt").Content
# Pin the version until https://github.com/krakjoe/pcov/issues/117 is resolved
$DLLVersion = "1.0.11"
Invoke-WebRequest https://windows.php.net/downloads/pecl/releases/pcov/$($DLLVersion)/php_pcov-$($DLLVersion)-$($env:php)-nts-vs16-$($env:platform).zip -OutFile pcov.zip
7z x -y pcov.zip > $null
Remove-Item c:\tools\php\* -include .zip
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.3.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.1.0"
with:
composer-options: "--ignore-platform-req=php+"
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ on:
jobs:
documentation:
name: "Documentation"
uses: "doctrine/.github/.github/workflows/documentation.yml@5.3.0"
uses: "doctrine/.github/.github/workflows/documentation.yml@7.1.0"
8 changes: 6 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.3"
- "8.4"

steps:
- name: "Checkout code"
Expand All @@ -49,6 +49,8 @@ jobs:

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v3"
with:
composer-options: "--ignore-platform-req=php+"

- name: "Run a static analysis with phpstan/phpstan"
run: "vendor/bin/phpstan --error-format=checkstyle | cs2pr"
Expand All @@ -60,7 +62,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.3"
- "8.4"

steps:
- name: Checkout code
Expand All @@ -75,6 +77,8 @@ jobs:

- name: Install dependencies with Composer
uses: ramsey/composer-install@v3
with:
composer-options: "--ignore-platform-req=php+"

- name: Run static analysis with Vimeo Psalm
run: vendor/bin/psalm --shepherd
Expand Down
19 changes: 19 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,25 @@ all drivers and middleware.

# Upgrade to 4.3

## Deprecated `Table::columnsAreIndexed()`

The `Table::columnsAreIndexed()` method has been deprecated.

## Deprecated usage of `RESTRICT` with Oracle and SQL Server

Relying on automatic conversion of the `RESTRICT` constraint referential action to `NO ACTION` on Oracle and SQL Server
is deprecated. Use `NO ACTION` instead.

## Deprecated introspection of SQLite foreign key constraints with omitted referenced column names in an incomplete schema

If the referenced column names are omitted in a foreign key constraint declaration, it implies that the constraint
references the primary key columns of the referenced table. If the referenced table is not present in the schema, the
constraint cannot be properly introspected, and the referenced column names are introspected as an empty list.
This behavior is deprecated.

In order to mitigate this issue, either ensure that the referenced table is present in the schema when introspecting
foreign constraints, or provide the referenced column names explicitly in the constraint declaration.

## Deprecated `UniqueConstraint` methods, property and behavior

The following `UniqueConstraint` methods and property have been deprecated:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.2",
"phpstan/phpstan": "1.12.6",
"phpstan/phpstan-phpunit": "1.4.0",
"phpstan/phpstan-strict-rules": "^1.6",
"phpunit/phpunit": "10.5.30",
"phpstan/phpstan": "2.1.1",
"phpstan/phpstan-phpunit": "2.0.3",
"phpstan/phpstan-strict-rules": "^2",
"phpunit/phpunit": "10.5.39",
"psalm/plugin-phpunit": "0.19.0",
"slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.10.2",
Expand Down
6 changes: 3 additions & 3 deletions docs/en/reference/schema-representation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ The following options are considered to be fully portable across all database pl
in the platform.
- **fixed** (boolean): Whether a ``string`` or ``binary`` Doctrine type column has
a fixed length. Defaults to ``false``.
- **precision** (integer): The precision of a Doctrine ``decimal`` or ``float`` type
column that determines the overall maximum number of digits to be stored (including scale).
- **precision** (integer): The precision of a Doctrine ``decimal``, ``number`` or ``float``
type column that determines the overall maximum number of digits to be stored (including scale).
Defaults to ``10``.
- **scale** (integer): The exact number of decimal digits to be stored in a Doctrine
``decimal`` or ``float`` type column. Defaults to ``0``.
``decimal``, ``number`` or ``float`` type column. Defaults to ``0``.
- **customSchemaOptions** (array): Additional options for the column that are
supported by all vendors:

Expand Down
Loading

0 comments on commit 7fd5074

Please sign in to comment.