Merge pull request #6 from ergebnis/feature/import

Enhancement: Import ergebnis/factory-girl-definition
ergebnis · Mar 8, 2020 · 117de87 · 117de87
2 parents 25be1d0 + 3570a94
commit 117de87
Show file tree

Hide file tree

Showing 31 changed files with 1,032 additions and 110 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
 
 env:
   MIN_COVERED_MSI: 91
-  MIN_MSI: 59
+  MIN_MSI: 53
   REQUIRED_PHP_EXTENSIONS: "mbstring"
 
 jobs:
@@ -252,6 +252,9 @@ jobs:
       - name: "Run auto-review tests with phpunit/phpunit"
         run: "vendor/bin/phpunit --configuration=test/AutoReview/phpunit.xml"
 
+      - name: "Run definition tests with phpunit/phpunit"
+        run: "vendor/bin/phpunit --configuration=test/Definition/phpunit.xml"
+
       - name: "Run doctrine tests with phpunit/phpunit"
         run: "vendor/bin/phpunit --configuration=test/Doctrine/phpunit.xml"
 

diff --git a/.php_cs b/.php_cs
@@ -35,8 +35,11 @@ $config->getFinder()
         '.build/',
         '.dependabot/',
         '.github/',
+        'src/Definition/',
         'src/Doctrine/',
+        'test/Definition/',
         'test/Doctrine/',
+        'test/Fixture/',
     ])
     ->name('.php_cs');
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ For a full diff see [`fa9c564...master`][fa9c564...master].
 ### Added
 
 * Imported [`breerly/factory-girl-php@0e6f1b6`](https://github.com/unhashable/factory-girl-php/tree/0e6f1b6724d39108a2e7cef68a74668b7a77b856), ([#1]), by [@localheinz]
+* Imported [`ergebnis/factory-girl-definition@23e57bc`](https://github.com/ergebnis/factory-girl-definition/tree/23e57bc2105ac7a32e3ec7103c866899fe6ad20c), ([#6]), by [@localheinz]
 
 ### Changed
 
@@ -20,5 +21,6 @@ For a full diff see [`fa9c564...master`][fa9c564...master].
 
 [#1]: https://github.com/ergebnis/factory-bot/pull/1
 [#3]: https://github.com/ergebnis/factory-bot/pull/3
+[#6]: https://github.com/ergebnis/factory-bot/pull/6
 
 [@localheinz]: https://github.com/localheinz
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 MIN_COVERED_MSI:=91
-MIN_MSI:=59
+MIN_MSI:=53
 
 .PHONY: it
 it: coding-standards dependency-analysis static-code-analysis tests ## Runs the coding-standards, dependency-analysis, static-code-analysis, and tests targets
@@ -46,6 +46,7 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
 tests: vendor ## Runs auto-review, unit, and integration tests with phpunit/phpunit
 	mkdir -p .build/phpunit
 	vendor/bin/phpunit --configuration=test/AutoReview/phpunit.xml
+	vendor/bin/phpunit --configuration=test/Definition/phpunit.xml
 	vendor/bin/phpunit --configuration=test/Doctrine/phpunit.xml
 	vendor/bin/phpunit --configuration=test/Unit/phpunit.xml
 	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml

diff --git a/composer.json b/composer.json
@@ -20,7 +20,9 @@
     "doctrine/annotations": "^1.7.0",
     "doctrine/collections": "^1.0.0",
     "doctrine/dbal": "^2.2.1",
-    "doctrine/orm": "^2.6.3"
+    "doctrine/orm": "^2.6.3",
+    "ergebnis/classy": "~0.5.2",
+    "fzaninotto/faker": "^1.9.1"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.2.4",
@@ -39,9 +41,6 @@
     "psalm/plugin-phpunit": "~0.9.0",
     "vimeo/psalm": "^3.9.4"
   },
-  "suggest": {
-    "fzaninotto/faker": "For generating fake data in entity definitions"
-  },
   "config": {
     "platform": {
       "php": "7.2.25"
@@ -54,6 +53,7 @@
       "Ergebnis\\FactoryBot\\": "src/"
     },
     "classmap": [
+      "src/Definition/",
       "src/Doctrine/"
     ]
   },
@@ -62,7 +62,9 @@
       "Ergebnis\\FactoryBot\\Test\\": "test/"
     },
     "classmap": [
-      "test/Doctrine/"
+      "test/Definition/",
+      "test/Doctrine/",
+      "test/Fixture/"
     ]
   },
   "support": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,6 +3,11 @@ includes:
 
 parameters:
 	checkMissingIterableValueType: false
+	ergebnis:
+		classesAllowedToBeExtended:
+			- Ergebnis\FactoryGirl\Definition\AbstractDefinition
+			- InvalidArgumentException
+			- RuntimeException
 	inferPrivatePropertyTypeFromConstructor: true
 	level: max
 	paths:

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -326,6 +326,11 @@
       <code>OptimisticLockException::lockFailedVersionMissmatch($entity, $lockVersion, $entity-&gt;getVersion())</code>
     </UndefinedMethod>
   </file>
+  <file src="test/Definition/DefinitionsTest.php">
+    <MixedAssignment occurrences="1">
+      <code>$definitions</code>
+    </MixedAssignment>
+  </file>
   <file src="test/Doctrine/Fixtures/BasicUsageTest.php">
     <MissingReturnType occurrences="12">
       <code>acceptsConstantValuesInEntityDefinitions</code>