Merge pull request #228 from edmondscommerce/DoctrineUpdateFixes

edmondscommerce · web-flow · commit da325517dbfa · 2020-09-09T10:45:11.000+01:00
Doctrine update fixes
diff --git a/README.md b/README.md
@@ -2,10 +2,11 @@
 ## By [Edmonds Commerce](https://www.edmondscommerce.co.uk)
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/00a50e56835f45b0ba32eed9c0285ede)](https://www.codacy.com/app/edmondscommerce/doctrine-static-meta?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=edmondscommerce/doctrine-static-meta&amp;utm_campaign=Badge_Grade) 
-[![Build Status](https://travis-ci.org/edmondscommerce/doctrine-static-meta.svg?branch=master)](https://travis-ci.org/edmondscommerce/doctrine-static-meta)
+
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/edmondscommerce/doctrine-static-meta/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/edmondscommerce/doctrine-static-meta/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/edmondscommerce/doctrine-static-meta/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/edmondscommerce/doctrine-static-meta/?branch=master)
+
 [![Code Intelligence Status](https://scrutinizer-ci.com/g/edmondscommerce/doctrine-static-meta/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/code-intelligence)
+
 [![Maintainability](https://api.codeclimate.com/v1/badges/fd4655978dc2137dd375/maintainability)](https://codeclimate.com/github/edmondscommerce/doctrine-static-meta/maintainability)
 
 An implementation of Doctrine using the [PHP Static Meta Data driver](http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/php-mapping.html#static-function) and no annotations.
@@ -42,6 +43,6 @@ password=YOURPASSWORDHERE
 
 ## Further Reading
 
-Documention is still very much a work in progress...
+Documentation is still very much a work in progress...
 
 Have a look in the [docs](docs) Folder
diff --git a/docs/Background.md b/docs/Background.md
@@ -54,4 +54,3 @@ There is a generator and command to support easily creating these. The field tra
 
 Finally, we are able to handle the relationship between Entities by using Traits. 
 
-To see how this works, it is suggest you have a look through some of the [example projects](https://github.com/edmondscommerce/doctrine-static-meta-example)
diff --git a/docs/Getting-Started.md b/docs/Getting-Started.md
@@ -4,12 +4,6 @@ This document describes how to get started with a DSM based Entities project
 
 The document assumes starting from a completely clean slate.
 
-## Example Project
-
-To help to explain how to work with this library, there is a separate repo with some example projects:
-
-https://github.com/edmondscommerce/doctrine-static-meta-example
-
 ## Set up Composer Dependencies
 
 ```
@@ -287,8 +281,6 @@ Ideally each Field will have some tests that ensure that the validation etc is a
 
 It is highly recommended that you have a build script to build up your entities, relations, fields, embeddables
 
-For inspiration on how to do this, suggest looking at the aforementioned [example projects repo](https://github.com/edmondscommerce/doctrine-static-meta-example)
-
 You have the choice of writing a BASH script which runs the commands, or writing a PHP script which interacts with the [Generator](./../src/CodeGeneration/Generator) objects directly.
 
 **The recommended approach is to write your build script in PHP**
diff --git a/qaConfig/qaConfig.inc.bash b/qaConfig/qaConfig.inc.bash
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 #Disable PHPUnit Coverage and allow it to run without xdebug - much faster
-export phpUnitCoverage=0
+if [[ "${CI:-false}" != "true " ]]; then
+  export phpUnitCoverage=0
+fi
 
 # Infection Configs
 ## Due to requiring to track random values, we can only run tests in a single thread
diff --git a/src/CodeGeneration/Command/GenerateFieldCommand.php b/src/CodeGeneration/Command/GenerateFieldCommand.php
@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+
 use function ltrim;
 
 class GenerateFieldCommand extends AbstractCommand
@@ -129,7 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
 
             $this->fieldGenerator->generateField(
                 ltrim($input->getOption(self::OPT_FQN), '\\'),
-                ltrim($input->getOption(self::OPT_TYPE),'\\'),
+                ltrim($input->getOption(self::OPT_TYPE), '\\'),
                 null,
                 $input->getOption(self::OPT_DEFAULT_VALUE) ?? null,
                 $input->getOption(self::OPT_IS_UNIQUE)
diff --git a/src/CodeGeneration/Filesystem/File/FindReplace.php b/src/CodeGeneration/Filesystem/File/FindReplace.php
@@ -6,8 +6,8 @@
 
 use Doctrine\Common\Inflector\Inflector;
 use EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Filesystem\File;
-
 use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
+
 use function lcfirst;
 use function preg_replace;
 use function str_replace;
diff --git a/src/CodeGeneration/Generator/Field/IdTrait.php b/src/CodeGeneration/Generator/Field/IdTrait.php
@@ -2,23 +2,17 @@
 
 declare(strict_types=1);
 
-/**
- * @category EdmondsCommerce
- * @package  EdmondsCommerce_
- * @author   Ross Mitchell <ross@edmondscommerce.co.uk>
- */
-
 namespace EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\Field;
 
 use EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\FindAndReplaceHelper;
 use LogicException;
 
 class IdTrait
 {
-    public const ID_FIELD_TRAIT         = 1;
-    public const INTEGER_ID_FIELD_TRAIT = 2;
-    public const NON_BINARY_UUID_TRAIT  = 4;
-    public const UUID_FIELD_TRAIT       = 8;
+    public const ID_FIELD_TRAIT               = 1;
+    public const INTEGER_ID_FIELD_TRAIT       = 2;
+    public const NON_BINARY_UUID_TRAIT        = 4;
+    public const UUID_FIELD_TRAIT             = 8;
     public const NON_ORDERED_UUID_FIELD_TRAIT = 16;
     /**
      * @var FindAndReplaceHelper
diff --git a/src/CodeGeneration/Generator/Field/StandardLibraryTestGenerator.php b/src/CodeGeneration/Generator/Field/StandardLibraryTestGenerator.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * When working on the standard library fields, this will generate a skeleton test for any fields you generate
- */
-
 namespace EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\Field;
 
 use EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\CodeHelper;
@@ -23,6 +19,9 @@
 use function realpath;
 use function str_replace;
 
+/**
+ * When working on the standard library fields, this will generate a skeleton test for any fields you generate
+ */
 class StandardLibraryTestGenerator
 {
     private const FIELDS_PATH = __DIR__ . '/../../../Entity/Fields/Traits';
diff --git a/src/Entity/Repositories/AbstractEntityRepository.php b/src/Entity/Repositories/AbstractEntityRepository.php
@@ -104,14 +104,14 @@ protected function initRepository(): void
     protected function getEntityFqn(): string
     {
         return '\\' . str_replace(
-                [
+            [
                     'Entity\\Repositories',
                 ],
-                [
+            [
                     'Entities',
                 ],
-                $this->namespaceHelper->cropSuffix(static::class, 'Repository')
-            );
+            $this->namespaceHelper->cropSuffix(static::class, 'Repository')
+        );
     }
 
     public function getRandomResultFromQueryBuilder(QueryBuilder $queryBuilder, string $entityAlias): ?EntityInterface
diff --git a/src/Entity/Savers/AbstractBulkProcess.php b/src/Entity/Savers/AbstractBulkProcess.php
@@ -141,9 +141,11 @@ public function addEntitiesToSave(array $entities)
             try {
                 $this->bulkSaveIfChunkBigEnough();
             } catch (DBALException $DBALException) {
-                throw new \RuntimeException('Failed saving chunk ' . $num . ' of ' . count($chunks),
-                                            $DBALException->getCode(),
-                                            $DBALException);
+                throw new \RuntimeException(
+                    'Failed saving chunk ' . $num . ' of ' . count($chunks),
+                    $DBALException->getCode(),
+                    $DBALException
+                );
             }
         }
         $this->entitiesToSave = array_merge($this->entitiesToSave, $entitiesToSaveBackup);
diff --git a/tests/Assets/TestCodeGenerator.php b/tests/Assets/TestCodeGenerator.php
@@ -485,7 +485,6 @@ static function ($fqn) {
                 return false === \ts\arrayContains($fqn, self::ARCH_FIELDS_EXCLUDE);
             }
         );
-
     }
 
     private function updateEmailEntity(): void
diff --git a/tests/Large/A/FullProjectBuildLargeTest.php b/tests/Large/A/FullProjectBuildLargeTest.php
@@ -835,10 +835,12 @@ protected function getFieldFqns(): array
     {
         $fieldFqns = [];
         foreach (MappingHelper::COMMON_TYPES as $type) {
-            $fieldFqns[] = self::TEST_FIELD_TRAIT_NAMESPACE . MappingHelper::getInflector()->classify($type) . 'FieldTrait';
+            $fieldFqns[] = self::TEST_FIELD_TRAIT_NAMESPACE
+                           . MappingHelper::getInflector()->classify($type) . 'FieldTrait';
         }
         foreach (self::UNIQUEABLE_FIELD_TYPES as $type) {
-            $fieldFqns[] = self::TEST_FIELD_TRAIT_NAMESPACE . MappingHelper::getInflector()->classify('unique_' . $type) . 'FieldTrait';
+            $fieldFqns[] = self::TEST_FIELD_TRAIT_NAMESPACE
+                           . MappingHelper::getInflector()->classify('unique_' . $type) . 'FieldTrait';
         }
 
         return $fieldFqns;
diff --git a/tests/Large/C/Entity/Fields/Traits/AbstractFieldTraitTest.php b/tests/Large/C/Entity/Fields/Traits/AbstractFieldTraitTest.php
@@ -77,7 +77,7 @@ abstract class AbstractFieldTraitTest extends AbstractLargeTest
      */
     protected static $fakerGenerator;
     protected static $buildOnce = true;
-    protected        $entitySuffix;
+    protected $entitySuffix;
 
     public function setup()
     {
diff --git a/tests/Large/E/CodeGeneration/Command/GenerateFieldMultipleTimesTest.php b/tests/Large/E/CodeGeneration/Command/GenerateFieldMultipleTimesTest.php
@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * @category EdmondsCommerce
- * @package  EdmondsCommerce_
- * @author   Ross Mitchell <ross@edmondscommerce.co.uk>
- */
-
 namespace EdmondsCommerce\DoctrineStaticMeta\Tests\Large\E\CodeGeneration\Command;
 
 use Doctrine\Common\Inflector\Inflector;
diff --git a/tests/Large/F/CodeGeneration/PostProcessor/FileOverriderTest.php b/tests/Large/F/CodeGeneration/PostProcessor/FileOverriderTest.php
@@ -7,6 +7,7 @@
 use EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\PostProcessor\FileOverrider;
 use EdmondsCommerce\DoctrineStaticMeta\Tests\Assets\AbstractTest;
 use RuntimeException;
+
 use function dirname;
 
 /**
diff --git a/tests/Medium/Entity/Validation/EntityDataValidatorTest.php b/tests/Medium/Entity/Validation/EntityDataValidatorTest.php
@@ -31,8 +31,8 @@ class EntityDataValidatorTest extends AbstractTest
         '192.136',
     ];
     protected static $buildOnce = true;
-    private          $testEntity;
-    private          $testDto;
+    private $testEntity;
+    private $testDto;
     /**
      * @var EntityDataValidator
      */
diff --git a/tests/Small/CodeGeneration/Field/IdTraitTest.php b/tests/Small/CodeGeneration/Field/IdTraitTest.php
@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * @category EdmondsCommerce
- * @package  EdmondsCommerce_
- * @author   Ross Mitchell <ross@edmondscommerce.co.uk>
- */
-
 namespace EdmondsCommerce\DoctrineStaticMeta\Tests\Small\CodeGeneration\Field;
 
 use EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\Field\IdTrait;
@@ -21,7 +15,7 @@
  *
  * @small
  * @testdox EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\Field\IdTrait
- * @covers \EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\Field\IdTrait
+ * @covers  \EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\Field\IdTrait
  * @package EdmondsCommerce\DoctrineStaticMeta\Tests\Small\CodeGeneration\Field
  */
 class IdTraitTest extends TestCase
@@ -100,8 +94,7 @@ private function getClass(): IdTrait
     private function getFakeFindAndReplace()
     {
         if ($this->fakeFindAndReplace === null) {
-            $this->fakeFindAndReplace = new class (new NamespaceHelper()) extends FindAndReplaceHelper
-            {
+            $this->fakeFindAndReplace = new class (new NamespaceHelper()) extends FindAndReplaceHelper {
 
                 private $traitThatWasReplaced;
 

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,3 @@ There is a generator and command to support easily creating these. The field tra`
`54`	`54`
`55`	`55`	`Finally, we are able to handle the relationship between Entities by using Traits.`
`56`	`56`
`57`		`-To see how this works, it is suggest you have a look through some of the [example projects](https://github.com/edmondscommerce/doctrine-static-meta-example)`