Merge pull request #4 from core23/develop

Fixed CS
nucleos · May 11, 2019 · 24b34da · 24b34da
2 parents 9643674 + 1de6fa3
commit 24b34da
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 66 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,7 @@
 .*               export-ignore
 Makefile         export-ignore
+phpstan.neon     export-ignore
 phpunit.xml.dist export-ignore
-docs/*           export-ignore
-tests/*          export-ignore
-vendor-bin/      export-ignore
+/docs            export-ignore
+/tests           export-ignore
+/vendor-bin      export-ignore
diff --git a/src/Adapter/ORM/AbstractEntityManager.php b/src/Adapter/ORM/AbstractEntityManager.php
@@ -16,5 +16,6 @@
 
 abstract class AbstractEntityManager extends BaseEntityManager
 {
-    use EntityManagerTrait, BaseQueryTrait;
+    use EntityManagerTrait;
+    use BaseQueryTrait;
 }
diff --git a/tests/Adapter/ORM/EntityManagerTraitTest.php b/tests/Adapter/ORM/EntityManagerTraitTest.php
@@ -27,6 +27,6 @@ public function testCreateQueryBuilder(): void
 
         $manager = new DemoEntityManager($repository->reveal());
 
-        $this->assertSame($queryBuilder->reveal(), $manager->getQueryBuilder('alias', 'someindex'));
+        static::assertSame($queryBuilder->reveal(), $manager->getQueryBuilder('alias', 'someindex'));
     }
 }
diff --git a/tests/Bridge/Symfony/Bundle/Core23DoctrineBundleTest.php b/tests/Bridge/Symfony/Bundle/Core23DoctrineBundleTest.php
@@ -20,20 +20,20 @@ public function testItIsInstantiable(): void
     {
         $bundle = new Core23DoctrineBundle();
 
-        $this->assertInstanceOf(BundleInterface::class, $bundle);
+        static::assertInstanceOf(BundleInterface::class, $bundle);
     }
 
     public function testGetPath(): void
     {
         $bundle = new Core23DoctrineBundle();
 
-        $this->assertStringEndsWith('Bridge/Symfony/Bundle', \dirname($bundle->getPath()));
+        static::assertStringEndsWith('Bridge/Symfony/Bundle', \dirname($bundle->getPath()));
     }
 
     public function testGetContainerExtension(): void
     {
         $bundle = new Core23DoctrineBundle();
 
-        $this->assertInstanceOf(Core23DoctrineExtension::class, $bundle->getContainerExtension());
+        static::assertInstanceOf(Core23DoctrineExtension::class, $bundle->getContainerExtension());
     }
 }
diff --git a/tests/Bridge/Symfony/DependencyInjection/Core23DoctrineExtensionTest.php b/tests/Bridge/Symfony/DependencyInjection/Core23DoctrineExtensionTest.php
@@ -20,7 +20,7 @@ public function testLoadDefault(): void
     {
         $this->load();
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     protected function getContainerExtensions()

diff --git a/tests/EventListener/ORM/ConfirmableListenerTest.php b/tests/EventListener/ORM/ConfirmableListenerTest.php
@@ -27,14 +27,14 @@ public function testItIsInstantiable(): void
     {
         $listener = new ConfirmableListener();
 
-        $this->assertInstanceOf(EventSubscriber::class, $listener);
+        static::assertInstanceOf(EventSubscriber::class, $listener);
     }
 
     public function testGetSubscribedEvents(): void
     {
         $listener = new ConfirmableListener();
 
-        $this->assertSame([
+        static::assertSame([
             Events::loadClassMetadata,
         ], $listener->getSubscribedEvents());
     }

diff --git a/tests/EventListener/ORM/DeletableListenerTest.php b/tests/EventListener/ORM/DeletableListenerTest.php
@@ -27,14 +27,14 @@ public function testItIsInstantiable(): void
     {
         $listener = new DeletableListener();
 
-        $this->assertInstanceOf(EventSubscriber::class, $listener);
+        static::assertInstanceOf(EventSubscriber::class, $listener);
     }
 
     public function testGetSubscribedEvents(): void
     {
         $listener = new DeletableListener();
 
-        $this->assertSame([
+        static::assertSame([
             Events::loadClassMetadata,
         ], $listener->getSubscribedEvents());
     }

diff --git a/tests/EventListener/ORM/LifecycleDateListenerTest.php b/tests/EventListener/ORM/LifecycleDateListenerTest.php
@@ -31,14 +31,14 @@ public function testItIsInstantiable(): void
     {
         $listener = new LifecycleDateListener();
 
-        $this->assertInstanceOf(EventSubscriber::class, $listener);
+        static::assertInstanceOf(EventSubscriber::class, $listener);
     }
 
     public function testGetSubscribedEvents(): void
     {
         $listener = new LifecycleDateListener();
 
-        $this->assertSame([
+        static::assertSame([
             Events::prePersist,
             Events::preUpdate,
             Events::loadClassMetadata,
@@ -76,7 +76,7 @@ public function testPrePersistForInvalidClass(): void
         $listener = new LifecycleDateListener();
         $listener->prePersist($eventArgs->reveal());
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testPreUpdate(): void
@@ -107,7 +107,7 @@ public function testPreUpdateForInvalidClass(): void
         $listener = new LifecycleDateListener();
         $listener->preUpdate($eventArgs->reveal());
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testLoadClassMetadataWithNoValidData(): void

diff --git a/tests/EventListener/ORM/SortableListenerTest.php b/tests/EventListener/ORM/SortableListenerTest.php
@@ -30,14 +30,14 @@ public function testItIsInstantiable(): void
     {
         $listener = new SortableListener();
 
-        $this->assertInstanceOf(EventSubscriber::class, $listener);
+        static::assertInstanceOf(EventSubscriber::class, $listener);
     }
 
     public function testGetSubscribedEvents(): void
     {
         $listener = new SortableListener();
 
-        $this->assertSame([
+        static::assertSame([
             Events::prePersist,
             Events::preUpdate,
             Events::preRemove,
@@ -57,7 +57,7 @@ public function testPrePersistForInvalidClass(): void
         $listener = new SortableListener();
         $listener->prePersist($eventArgs->reveal());
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testPreRemoveForInvalidClass(): void
@@ -72,7 +72,7 @@ public function testPreRemoveForInvalidClass(): void
         $listener = new SortableListener();
         $listener->preRemove($eventArgs->reveal());
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testLoadClassMetadataWithNoValidData(): void

diff --git a/tests/EventListener/ORM/TablePrefixEventListenerTest.php b/tests/EventListener/ORM/TablePrefixEventListenerTest.php
@@ -20,14 +20,14 @@ public function testItIsInstantiable(): void
     {
         $listener = new TablePrefixEventListener('acme_');
 
-        $this->assertInstanceOf(EventSubscriber::class, $listener);
+        static::assertInstanceOf(EventSubscriber::class, $listener);
     }
 
     public function testGetSubscribedEvents(): void
     {
         $listener = new TablePrefixEventListener('acme_');
 
-        $this->assertSame([
+        static::assertSame([
             Events::loadClassMetadata,
         ], $listener->getSubscribedEvents());
     }

diff --git a/tests/EventListener/ORM/UniqueActiveListenerTest.php b/tests/EventListener/ORM/UniqueActiveListenerTest.php
@@ -30,14 +30,14 @@ public function testItIsInstantiable(): void
     {
         $listener = new UniqueActiveListener();
 
-        $this->assertInstanceOf(EventSubscriber::class, $listener);
+        static::assertInstanceOf(EventSubscriber::class, $listener);
     }
 
     public function testGetSubscribedEvents(): void
     {
         $listener = new UniqueActiveListener();
 
-        $this->assertSame([
+        static::assertSame([
             Events::prePersist,
             Events::preUpdate,
             Events::loadClassMetadata,
@@ -56,7 +56,7 @@ public function testPrePersistForInvalidClass(): void
         $listener = new UniqueActiveListener();
         $listener->prePersist($eventArgs->reveal());
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testPreUpdateForInvalidClass(): void
@@ -71,7 +71,7 @@ public function testPreUpdateForInvalidClass(): void
         $listener = new UniqueActiveListener();
         $listener->preUpdate($eventArgs->reveal());
 
-        $this->assertTrue(true);
+        static::assertTrue(true);
     }
 
     public function testLoadClassMetadataWithNoValidData(): void

diff --git a/tests/Fixtures/ClassWithAllProperties.php b/tests/Fixtures/ClassWithAllProperties.php
@@ -21,7 +21,10 @@
 
 final class ClassWithAllProperties implements DeletableInterface, ConfirmableInterface, LifecycleDateTimeInterface, PositionAwareInterface, UniqueActiveInterface
 {
-    use DeleteableTrait, ConfirmableTrait, LifecycleDateTimeTrait, SortableTrait;
+    use DeleteableTrait;
+    use ConfirmableTrait;
+    use LifecycleDateTimeTrait;
+    use SortableTrait;
 
     /**
      * @var bool

diff --git a/tests/Manager/ORM/BaseQueryTraitTest.php b/tests/Manager/ORM/BaseQueryTraitTest.php
@@ -33,7 +33,7 @@ public function testAddOrder(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
+        static::assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
             $builder->reveal(),
             ['position'],
             'myalias'
@@ -48,7 +48,7 @@ public function testAddOrderWithOrder(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
+        static::assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
             $builder->reveal(),
             ['position'],
             'myalias',
@@ -68,7 +68,7 @@ public function testAddOrderWithMultpleSorts(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
+        static::assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
             $builder->reveal(),
             ['position', 'otherfield'],
             'myalias',
@@ -91,7 +91,7 @@ public function testAddOrderWithMultpleSortAndOrders(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
+        static::assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
             $builder->reveal(),
             [
                 'position',
@@ -112,7 +112,7 @@ public function testAddOrderWithChildOrder(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
+        static::assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
             $builder->reveal(),
             ['child.position'],
             'myalias',
@@ -129,7 +129,7 @@ public function testAddOrderWithAliasChildOrder(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
+        static::assertSame($builder->reveal(), $this->manager->addOrderToQueryBuilder(
             $builder->reveal(),
             ['f.position'],
             'myalias',

diff --git a/tests/Manager/ORM/SearchQueryTraitTest.php b/tests/Manager/ORM/SearchQueryTraitTest.php
@@ -58,7 +58,7 @@ public function testSearchWhere(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($orx->reveal(), $this->manager->searchWhereQueryBuilder(
+        static::assertSame($orx->reveal(), $this->manager->searchWhereQueryBuilder(
             $builder->reveal(),
             'field',
             ['foo']
@@ -77,7 +77,7 @@ public function testStrictSearchWhere(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($orx->reveal(), $this->manager->searchWhereQueryBuilder(
+        static::assertSame($orx->reveal(), $this->manager->searchWhereQueryBuilder(
             $builder->reveal(),
             'field',
             ['foo'],
@@ -109,7 +109,7 @@ public function testSearchWhereMultipleValues(): void
             ->shouldBeCalled()
         ;
 
-        $this->assertSame($orx->reveal(), $this->manager->searchWhereQueryBuilder(
+        static::assertSame($orx->reveal(), $this->manager->searchWhereQueryBuilder(
             $builder->reveal(),
             'field',
             ['foo', 'bar', 'baz'],

diff --git a/tests/Model/Traits/ConfirmableTraitTest.php b/tests/Model/Traits/ConfirmableTraitTest.php
@@ -19,28 +19,28 @@ public function testIsConfirmedWithDefault(): void
     {
         $model = $this->createTraitMock();
 
-        $this->assertNull($model->getConfirmedAt());
+        static::assertNull($model->getConfirmedAt());
     }
 
     public function testGetConfirmedAtWithDefault(): void
     {
         $model = $this->createTraitMock();
 
-        $this->assertFalse($model->isConfirmed());
+        static::assertFalse($model->isConfirmed());
     }
 
     public function testSetUnConfirmed(): void
     {
         $model = $this->createTraitMock();
         $model->setConfirmed(true);
 
-        $this->assertTrue($model->isConfirmed());
-        $this->assertNotNull($model->getConfirmedAt());
+        static::assertTrue($model->isConfirmed());
+        static::assertNotNull($model->getConfirmedAt());
 
         $model->setConfirmed(false);
 
-        $this->assertFalse($model->isConfirmed());
-        $this->assertNull($model->getConfirmedAt());
+        static::assertFalse($model->isConfirmed());
+        static::assertNull($model->getConfirmedAt());
     }
 
     public function testSetConfirmedAt(): void
@@ -50,8 +50,8 @@ public function testSetConfirmedAt(): void
         $model = $this->createTraitMock();
         $model->setConfirmedAt($now);
 
-        $this->assertSame($now, $model->getConfirmedAt());
-        $this->assertTrue($model->isConfirmed());
+        static::assertSame($now, $model->getConfirmedAt());
+        static::assertTrue($model->isConfirmed());
     }
 
     private function createTraitMock()