Merge branch '1.6' into 1.7

 Conflicts:
	.github/workflows/ci.yml
	composer.json

Author: eigan

.github/workflows/ci.yml

@@ -7,11 +7,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ['7.3', '7.4', '8.0']
-        doctrine: ['2.6', '2.7', '2.8', '2.9']
-        exclude:
-          - php: '8.0'
-            doctrine: '2.6'
+        php: ['7.3', '7.4', '8.0', '8.1']
+        doctrine: ['2.8', '2.9', '2.10', '2.11']
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP
@@ -31,10 +28,8 @@ jobs:
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
-      - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
       - name: Install dependencies for doctrine/orm ${{ matrix.doctrine }}
-        run: composer require --no-progress --no-scripts --no-plugins -v -W doctrine/orm ~${{ matrix.doctrine }}
+        run: composer require --no-progress --no-scripts --no-plugins -v -W doctrine/orm "~${{ matrix.doctrine }}.0"
       - name: PHPUnit
         run: vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-text
       - uses: codecov/codecov-action@v1

composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
+        "doctrine/annotations": "^1",
         "doctrine/cache": "^1",
         "doctrine/dbal": "^2.13",
         "doctrine/orm": "^2.6",

src/Console/GenerateEntitiesCommand.php

@@ -78,7 +78,7 @@ public function handle(ManagerRegistry $registry)
                 $entityGenerator->setGenerateStubMethods($this->option('generate-methods'));
                 $entityGenerator->setRegenerateEntityIfExists($this->option('regenerate-entities'));
                 $entityGenerator->setUpdateEntityIfExists($this->option('update-entities'));
-                $entityGenerator->setNumSpaces($this->option('num-spaces'));
+                $entityGenerator->setNumSpaces((int) $this->option('num-spaces'));
                 $entityGenerator->setBackupExisting(!$this->option('no-backup'));
 
                 if (($extend = $this->option('extend')) !== null) {