Merge branch '1.3' into 2.0

b2pweb · May 13, 2022 · 46fc5aa · 46fc5aa
2 parents 5a88d24 + 85df1b9
commit 46fc5aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,15 +2,9 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
-      - '2.0'
-      - '1.0'
+    branches: [ '[1-9].[0-9]+' ]
   pull_request:
-    branches:
-     - 'master'
-     - '2.0'
-     - '1.0'
+    branches: [ '[1-9].[0-9]+' ]
 
 jobs:
   build:

diff --git a/CHANGELOG b/CHANGELOG
@@ -89,6 +89,7 @@ BC Breaks
 * Change signature of `Bdf\Prime\Query\SqlQueryInterface`.
 * Change signature of `Bdf\Prime\Relations\CustomRelationInterface`.
 * Change signature of `Bdf\Prime\Relations\RelationInterface`.
+* Change signature of `Bdf\Prime\Relations\AbstractRelation::applyWhereKeys()`.
 * Change signature of `Bdf\Prime\Repository\RepositoryInterface`.
 * Change signature of `Bdf\Prime\Repository\Write\WriterInterface`.
 * Change signature of `Bdf\Prime\Schema\Manager\QueryManagerInterface`.

diff --git a/composer.json b/composer.json
@@ -59,12 +59,6 @@
     "tests-with-coverage": "phpunit --coverage-clover coverage.xml",
     "psalm": "psalm --shepherd --no-cache --output-format=github"
   },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.3-dev",
-      "dev-2.0": "2.0-dev"
-    }
-  },
   "suggest": {
     "b2p/bdf-console": "required to use prime commands (~1.5)",
     "b2p/bdf-web": "required to use service provider (~1.5)",