Merge pull request #229 from darkdef/fix_recur2

Remove packages from req-dev and add to gitflow

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
 
     env:
       COMPOSER_ROOT_VERSION: "dev-master"
-      extensions: dom, json, pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv-5.9.0preview1, oci8
+      extensions: dom, json, pdo, pdo_mysql, oci8, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv-5.9.0preview1
       key: cache-v1
 
     runs-on: ${{ matrix.os }}
@@ -119,6 +119,27 @@ jobs:
         if: matrix.php == '8.0'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
+      - name: Install active-record
+        run: composer require yiisoft/active-record --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Install db-mssql
+        run: composer require yiisoft/db-mssql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Install db-mysql
+        run: composer require yiisoft/db-mysql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Install db-pgsql
+        run: composer require yiisoft/db-pgsql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Install db-oracle
+        run: composer require yiisoft/db-oracle --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Install db-redis
+        run: composer require yiisoft/db-redis --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Install db-sqlite
+        run: composer require yiisoft/db-sqlite --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
       - name: Run tests with phpunit and coverage on Linux php 7.4
         if: matrix.php == '7.4'
         run: vendor/bin/phpunit --coverage-clover=coverage.clover --colors=always

.github/workflows/db-mssql.yml

@@ -91,5 +91,8 @@ jobs:
         if: matrix.php == '8.0'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
+      - name: Install db-mssql
+        run: composer require yiisoft/db-mssql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
       - name: Run mssql tests with phpunit
         run: vendor/bin/phpunit --testsuite Mssql --colors=always

.github/workflows/db-mysql.yml

@@ -86,5 +86,8 @@ jobs:
         if: matrix.php == '8.0'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
+      - name: Install db-mysql
+        run: composer require yiisoft/db-mysql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
       - name: Run tests with phpunit
         run: vendor/bin/phpunit --testsuite Mysql --colors=always

.github/workflows/db-pgsql.yml

@@ -90,5 +90,8 @@ jobs:
         if: matrix.php == '8.0'
         run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
+      - name: Install db-pgsql
+        run: composer require yiisoft/db-pgsql --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
       - name: Run pgsql tests with phpunit
         run: vendor/bin/phpunit --testsuite Pgsql --colors=always

composer.json

@@ -36,14 +36,7 @@
         "roave/infection-static-analysis-plugin": "^1.5",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.2",
-        "yiisoft/active-record": "^3.0@dev",
         "yiisoft/aliases": "^1.1|^2.0",
-        "yiisoft/db-mssql": "^1.0@dev",
-        "yiisoft/db-mysql": "^3.0@dev",
-        "yiisoft/db-oracle": "^1.0@dev",
-        "yiisoft/db-pgsql": "^3.0@dev",
-        "yiisoft/db-redis": "^1.0@dev",
-        "yiisoft/db-sqlite": "^3.0@dev",
         "yiisoft/di": "^3.0@dev",
         "yiisoft/event-dispatcher": "^1.0",
         "yiisoft/json": "^1.0"