Merge pull request #17 from smartboxgroup/feature/datetime-creator

melmccann · web-flow · commit 6421ea648d06 · 2018-12-12T14:08:51.000Z
Add a datetime creator and test. Require simple-phpunit
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   - SYMFONY_VERSION=2.7.*
@@ -17,7 +17,7 @@ before_script:
   - composer install --prefer-dist --no-interaction
 
 script:
-  - bin/phpunit --coverage-text --debug
+  - SYMFONY_PHPUNIT_VERSION=6.5 SYMFONY_DEPRECATIONS_HELPER=weak bin/simple-phpunit --coverage-text
 
 notifications:
   email:
diff --git a/Tests/Command/Fixtures/GenerateRandomFixtureCommandTest.php b/Tests/Command/Fixtures/GenerateRandomFixtureCommandTest.php
@@ -57,12 +57,6 @@ public function dataProviderForEntityGeneration()
     /**
      * @dataProvider dataProviderForEntityGeneration
      *
-     * @covers ::execute
-     * @covers Smartbox\CoreBundle\Utils\Generator\RandomFixtureGenerator::generate
-     * @covers Smartbox\CoreBundle\Utils\Helper\NamespaceResolver::resolveNamespaceForClass
-     * @covers Smartbox\CoreBundle\Type\Context\ContextFactory::createSerializationContextForFixtures
-     * @covers Smartbox\CoreBundle\Type\Context\ContextFactory::createDeserializationContextForFixtures
-     *
      * @param $group
      * @param $version
      */
diff --git a/Tests/Exception/Serializer/DeserializationTypeMismatchExceptionTest.php b/Tests/Exception/Serializer/DeserializationTypeMismatchExceptionTest.php
@@ -4,7 +4,7 @@
 
 use Smartbox\CoreBundle\Exception\Serializer\DeserializationTypeMismatchException;
 
-class DeserializationTypeMismatchExceptionTest extends \PHPUnit_Framework_TestCase
+class DeserializationTypeMismatchExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /** @var DeserializationTypeMismatchException */
     private $exception;
diff --git a/Tests/Serializer/ArrayDeserializationVisitorFunctionalTest.php b/Tests/Serializer/ArrayDeserializationVisitorFunctionalTest.php
@@ -13,7 +13,7 @@
 use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;
 use Smartbox\CoreBundle\Tests\Fixtures\Entity\TestEntity;
 
-class ArrayDeserializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase
+class ArrayDeserializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase
 {
     /** @var SerializerInterface */
     private $serializer;
diff --git a/Tests/Serializer/ArraySerializationVisitorFunctionalTest.php b/Tests/Serializer/ArraySerializationVisitorFunctionalTest.php
@@ -10,7 +10,7 @@
 use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;
 use Smartbox\CoreBundle\Tests\Fixtures\Entity\TestEntity;
 
-class ArraySerializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase
+class ArraySerializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase
 {
     /** @var SerializerInterface $serializer */
     private $serializer;
diff --git a/Tests/Serializer/DeserializationVisitorValidatorTest.php b/Tests/Serializer/DeserializationVisitorValidatorTest.php
@@ -5,7 +5,7 @@
 use JMS\Serializer\GenericDeserializationVisitor;
 use Smartbox\CoreBundle\Serializer\DeserializationTypesValidator;
 
-class DeserializationVisitorValidatorTest extends \PHPUnit_Framework_TestCase
+class DeserializationVisitorValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \JMS\Serializer\GenericDeserializationVisitor|\PHPUnit_Framework_MockObject_MockObject */
     private $visitorMock;
diff --git a/Tests/Serializer/JsonDeserializationVisitorFunctionalTest.php b/Tests/Serializer/JsonDeserializationVisitorFunctionalTest.php
@@ -11,7 +11,7 @@
 use Smartbox\CoreBundle\Serializer\StrongDeserializationCastingChecker;
 use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;
 
-class JsonDeserializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase
+class JsonDeserializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase
 {
     /** @var SerializerInterface */
     private $serializer;
diff --git a/Tests/Serializer/StrongDeserializationCastingCheckerTest.php b/Tests/Serializer/StrongDeserializationCastingCheckerTest.php
@@ -4,7 +4,7 @@
 
 use Smartbox\CoreBundle\Serializer\StrongDeserializationCastingChecker;
 
-class StrongDeserializationCastingCheckerTest extends \PHPUnit_Framework_TestCase
+class StrongDeserializationCastingCheckerTest extends \PHPUnit\Framework\TestCase
 {
     /** @var StrongDeserializationCastingChecker */
     private $checker;
diff --git a/Tests/Serializer/XmlDeserializationVisitorFunctionalTest.php b/Tests/Serializer/XmlDeserializationVisitorFunctionalTest.php
@@ -11,7 +11,7 @@
 use Smartbox\CoreBundle\Serializer\XmlDeserializationVisitor;
 use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;
 
-class XmlDeserializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase
+class XmlDeserializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase
 {
     /** @var SerializerInterface $serializer */
     private $serializer;
diff --git a/Tests/Symfony/Validator/AbstractValidatorTest.php b/Tests/Symfony/Validator/AbstractValidatorTest.php
@@ -28,7 +28,7 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractValidatorTest extends \PHPUnit\Framework\TestCase
 {
     const ENTITY_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
 
diff --git a/Tests/Utils/Cache/PredisCacheServiceTest.php b/Tests/Utils/Cache/PredisCacheServiceTest.php
@@ -9,7 +9,7 @@
 /**
  * Class PredisCacheServiceTest.
  */
-class PredisCacheServiceTest extends \PHPUnit_Framework_TestCase
+class PredisCacheServiceTest extends \PHPUnit\Framework\TestCase
 {
     /** @var PredisCacheService */
     protected $service;
diff --git a/Tests/Utils/Generator/RandomFixtureGeneratorTest.php b/Tests/Utils/Generator/RandomFixtureGeneratorTest.php
@@ -60,10 +60,6 @@ public function dataProviderForGroupsAndVersions()
     /**
      * @dataProvider dataProviderForGroupsAndVersions
      *
-     * @covers ::generate
-     * @covers Smartbox\CoreBundle\Type\Context\ContextFactory::createSerializationContextForFixtures
-     * @covers Smartbox\CoreBundle\Type\Context\ContextFactory::createDeserializationContextForFixtures
-     *
      * @param $group
      * @param $version
      */
@@ -89,9 +85,6 @@ public function testGenerate($group, $version)
         $this->assertEquals($entity, $deserializedEntity);
     }
 
-    /**
-     * @covers ::generate
-     */
     public function testGenerateForNonEntityClass()
     {
         $this->expectException(\InvalidArgumentException::class);
diff --git a/Tests/Utils/Helper/DateTimeCreatorTest.php b/Tests/Utils/Helper/DateTimeCreatorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Smartbox\CoreBundle\Tests\Utils\Helper;
+
+use Smartbox\CoreBundle\Utils\Helper\DateTimeCreator;
+use Symfony\Bridge\PhpUnit\ClockMock;
+
+/**
+ * @coversDefaultClass \Smartbox\CoreBundle\Utils\Helper\DateTimeCreator
+ */
+class DateTimeCreatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @dataProvider microtimeProvider
+     *
+     * @param $microtime
+     * @param $expectedDateTime
+     * @throws \ReflectionException
+     */
+    public function testGetNowDateTimePHP70($microtime, $expectedDateTime)
+    {
+        if (PHP_VERSION_ID >= 70100) {
+            $this->markTestSkipped('Skipped as using a different method to create a datetime');
+        }
+
+        $clockReflection = new \ReflectionClass(ClockMock::class);
+
+        $reflectionProperty = $clockReflection->getProperty('now');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($microtime);
+
+        ClockMock::register(DateTimeCreator::class);
+
+        $datetime = DateTimeCreator::getNowDateTime();
+
+        $this->assertEquals($expectedDateTime, $datetime);
+    }
+
+    public function testGetNowDateTimePHP71()
+    {
+        if (PHP_VERSION_ID < 70100) {
+            $this->markTestSkipped('Skipped as using a different method to create date time');
+        }
+
+        $datetime = DateTimeCreator::getNowDateTime();
+
+        $this->assertInstanceOf(\DateTime::class, $datetime);
+    }
+
+    public function microtimeProvider()
+    {
+        return [
+            'with-decimal' => [
+                1544538334.9465,
+                new \DateTime('2018-12-11 14:25:34.946500'),
+            ],
+            'without-decimal' => [
+                1544538334,
+                new \DateTime('2018-12-11 14:25:34.000000'),
+            ],
+            'with-decimal-zero' => [
+                1544538334.0,
+                new \DateTime('2018-12-11 14:25:34.000000'),
+            ],
+        ];
+    }
+}
diff --git a/Tests/Utils/Helper/NamespaceResolverTest.php b/Tests/Utils/Helper/NamespaceResolverTest.php
@@ -8,11 +8,8 @@
 /**
  * @coversDefaultClass Smartbox\CoreBundle\Utils\Helper\NamespaceResolver
  */
-class NamespaceResolverTest extends \PHPUnit_Framework_TestCase
+class NamespaceResolverTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers ::resolveNamespaceForClass
-     */
     public function testResolveNamespaceForClassNameOnly()
     {
         $namespaces = [
@@ -28,9 +25,6 @@ public function testResolveNamespaceForClassNameOnly()
         );
     }
 
-    /**
-     * @covers ::resolveNamespaceForClass
-     */
     public function testResolveNamespaceForClassNamespace()
     {
         $namespaces = [
@@ -46,9 +40,6 @@ public function testResolveNamespaceForClassNamespace()
         );
     }
 
-    /**
-     * @covers ::resolveNamespaceForClass
-     */
     public function testResolveNamespaceForNotExistingClass()
     {
         $this->expectException(\InvalidArgumentException::class);
diff --git a/Tests/Utils/Monolog/Formatter/JMSSerializerFormatterTest.php b/Tests/Utils/Monolog/Formatter/JMSSerializerFormatterTest.php
@@ -57,7 +57,6 @@ public function dataProviderForFormatter()
 
     /**
      * @dataProvider dataProviderForFormatter
-     * @covers Smartbox\CoreBundle\Utils\Monolog\Formatter\JMSSerializerFormatter::format
      *
      * @param $expected
      * @param $entity
diff --git a/Tests/Validation/ValidatorWithExclusionTest.php b/Tests/Validation/ValidatorWithExclusionTest.php
@@ -17,9 +17,6 @@
 use Symfony\Component\Validator\MetadataFactoryInterface;
 use Symfony\Component\Validator\Validator\RecursiveValidator;
 
-/**
- * @covers ValidatorWithExclusion
- */
 class ValidatorWithExclusionTest extends RecursiveValidator2Dot5ApiTest
 {
     /** @var  ValidatorWithExclusion */
diff --git a/Utils/Helper/DateTimeCreator.php b/Utils/Helper/DateTimeCreator.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Smartbox\CoreBundle\Utils\Helper;
+
+class DateTimeCreator
+{
+    /**
+     * Using the same strategy as Monolog does for creating time stamps with micro seconds.
+     *
+     * microtime without \ is used as it we need to be able to ClockMock it.
+     *
+     * @return \DateTime
+     */
+    public static function getNowDateTime()
+    {
+        if (PHP_VERSION_ID < 70100) {
+            $now = \DateTime::createFromFormat('U.u', \sprintf('%.6F', microtime(true)));
+        } else {
+            $now = new \DateTime(null);
+        }
+
+        return $now;
+    }
+}
diff --git a/composer.json b/composer.json
@@ -18,13 +18,11 @@
         "doctrine/annotations": "^1.2.0"
     },
     "require-dev": {
-        "phpunit/php-code-coverage": "~4.0",
-        "phpunit/phpunit-mock-objects": "~3.2",
-        "phpunit/phpunit": "~5.4",
         "sensio/generator-bundle": "~2.3",
         "digitalnature/php-ref": "dev-master",
         "snc/redis-bundle": "^1.1",
-        "predis/predis": "^1.0"
+        "predis/predis": "^1.0",
+        "symfony/phpunit-bridge": "*"
     },
     "config": {
         "bin-dir": "bin"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Smartbox\CoreBundle\Exception\Serializer\DeserializationTypeMismatchException;`
`6`	`6`
`7`		`-class DeserializationTypeMismatchExceptionTest extends \PHPUnit_Framework_TestCase`
	`7`	`+class DeserializationTypeMismatchExceptionTest extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`	`9`	`/** @var DeserializationTypeMismatchException */`
`10`	`10`	`private $exception;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;`
`14`	`14`	`use Smartbox\CoreBundle\Tests\Fixtures\Entity\TestEntity;`
`15`	`15`
`16`		`-class ArrayDeserializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase`
	`16`	`+class ArrayDeserializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase`
`17`	`17`	`{`
`18`	`18`	`/** @var SerializerInterface */`
`19`	`19`	`private $serializer;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;`
`11`	`11`	`use Smartbox\CoreBundle\Tests\Fixtures\Entity\TestEntity;`
`12`	`12`
`13`		`-class ArraySerializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase`
	`13`	`+class ArraySerializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase`
`14`	`14`	`{`
`15`	`15`	`/** @var SerializerInterface $serializer */`
`16`	`16`	`private $serializer;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use JMS\Serializer\GenericDeserializationVisitor;`
`6`	`6`	`use Smartbox\CoreBundle\Serializer\DeserializationTypesValidator;`
`7`	`7`
`8`		`-class DeserializationVisitorValidatorTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class DeserializationVisitorValidatorTest extends \PHPUnit\Framework\TestCase`
`9`	`9`	`{`
`10`	`10`	`/** @var \JMS\Serializer\GenericDeserializationVisitor\|\PHPUnit_Framework_MockObject_MockObject */`
`11`	`11`	`private $visitorMock;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Smartbox\CoreBundle\Serializer\StrongDeserializationCastingChecker;`
`12`	`12`	`use Smartbox\CoreBundle\Tests\Fixtures\Entity\EntityConstants;`
`13`	`13`
`14`		`-class JsonDeserializationVisitorFunctionalTest extends \PHPUnit_Framework_TestCase`
	`14`	`+class JsonDeserializationVisitorFunctionalTest extends \PHPUnit\Framework\TestCase`
`15`	`15`	`{`
`16`	`16`	`/** @var SerializerInterface */`
`17`	`17`	`private $serializer;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Smartbox\CoreBundle\Serializer\StrongDeserializationCastingChecker;`
`6`	`6`
`7`		`-class StrongDeserializationCastingCheckerTest extends \PHPUnit_Framework_TestCase`
	`7`	`+class StrongDeserializationCastingCheckerTest extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`	`9`	`/** @var StrongDeserializationCastingChecker */`
`10`	`10`	`private $checker;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`30`	`30`	`*/`
`31`		`-abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase`
	`31`	`+abstract class AbstractValidatorTest extends \PHPUnit\Framework\TestCase`
`32`	`32`	`{`
`33`	`33`	`const ENTITY_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\Entity';`
`34`	`34`