Address mutation testing issues

Author: Riimu

.gitignore

@@ -1,4 +1,6 @@
 build/
 vendor/
 composer.lock
+infection.json.dist
+infection-log.txt
 psalm.xml

.travis.yml

@@ -15,7 +15,7 @@ before_install:
 
 install:
   - mkdir -p build/php_codesniffer build/php-cs-fixer build/ocular
-  - composer require --no-suggest --no-progress -n -a -d build/php-cs-fixer "friendsofphp/php-cs-fixer:^2.12"
+  - composer require --no-suggest --no-progress -n -a -d build/php-cs-fixer "friendsofphp/php-cs-fixer:^2.13"
   - composer require --no-suggest --no-progress -n -a -d build/php_codesniffer "squizlabs/php_codesniffer:^3.3"
   - composer require --no-suggest --no-progress -n -a -d build/ocular "scrutinizer/ocular:^1.5"
   - composer update --no-suggest --no-progress -n -a

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Improved tests and some failure conditions with mutation testing
 
 ## [0.2.1] - 2018-07-18
 ### Added

composer.json

@@ -25,8 +25,8 @@
     "psr/container-implementation": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.2",
-    "riimu/php-cs-fixer-config": "^0.1.0",
+    "phpunit/phpunit": "^7.3",
+    "riimu/php-cs-fixer-config": "^0.1.1",
     "riimu/sami-config": "^0.1.0"
   },
   "autoload": {

src/AbstractEntryProvider.php

@@ -32,7 +32,7 @@ public function getMethods(): array
         foreach ($reflection->getMethods() as $method) {
             $identifier = $this->getMethodIdentifier($method);
 
-            if ($identifier !== null) {
+            if (!\is_null($identifier)) {
                 $methods[$identifier] = $method->getName();
             }
         }
@@ -51,13 +51,13 @@ private function getMethodIdentifier(\ReflectionMethod $method): ?string
             return null;
         }
 
-        if (strncmp($method->getName(), '__', 2) === 0) {
+        if (preg_match('/^__[^_]/', $method->getName())) {
             return null;
         }
 
         $type = $method->getReturnType();
 
-        if ($type === null || $type->isBuiltin()) {
+        if (!$type instanceof \ReflectionType || $type->isBuiltin()) {
             return null;
         }
 

src/Container.php

@@ -116,7 +116,7 @@ private function isConstantValue($value): bool
             return true;
         }
 
-        return $value === null || is_scalar($value);
+        return is_scalar($value) || \is_null($value);
     }
 
     /**

src/ContainerBuilder.php

@@ -92,7 +92,7 @@ private function getWiredParameters(\ReflectionClass $reflection, array $overrid
     {
         $constructor = $reflection->getConstructor();
 
-        if ($constructor === null) {
+        if (!$constructor instanceof \ReflectionMethod) {
             return [];
         }
 
@@ -108,7 +108,7 @@ private function getWiredParameters(\ReflectionClass $reflection, array $overrid
 
             $type = $parameter->getType();
 
-            if ($type === null || $type->isBuiltin()) {
+            if (!$type instanceof \ReflectionType || $type->isBuiltin()) {
                 throw new \InvalidArgumentException(
                     sprintf("Missing autowired parameter '%s' for '%s'", $name, $reflection->getName())
                 );

tests/tests/ContainerTest.php

@@ -56,17 +56,20 @@ public static function getDate(): \DateTime
     public function testProviderEntry()
     {
         $testClass = new class() extends AbstractEntryProvider {
-            public function getFoo()
+            public function getNow()
             {
-                return 'foo';
+                return new \DateTime();
             }
         };
 
         $this->withContainer([
             \get_class($testClass) => new CallableEntry([\get_class($testClass), 'initialize']),
-            'foo_value' => new ProviderEntry([$testClass, 'getFoo']),
+            'now' => new ProviderEntry([$testClass, 'getNow']),
         ], function (Container $container) {
-            $this->assertSame('foo', $container->get('foo_value'));
+            $now = $container->get('now');
+
+            $this->assertInstanceOf(\DateTime::class, $now);
+            $this->assertSame($now, $container->get('now'));
         });
     }
 
@@ -82,6 +85,11 @@ public function testWiredEntry()
 
             $this->assertInstanceOf(\DateTime::class, $date);
             $this->assertSame(strtotime($time), $date->getTimestamp());
+
+            $other = $container->get(\DateTime::class);
+
+            $this->assertInstanceOf(\DateTime::class, $other);
+            $this->assertSame($date, $other);
         });
     }
 
@@ -178,6 +186,23 @@ public function testDoubleCaching()
         });
     }
 
+    public function testSortingOnCache()
+    {
+        $container = $this->getCachedContainer([
+            'b' => 'b_value',
+            'c' => 'c_value',
+            'a' => 'a_value',
+        ]);
+
+        $types = new \ReflectionProperty($container, 'types');
+        $types->setAccessible(true);
+        $parameters = new \ReflectionProperty($container, 'parameters');
+        $parameters->setAccessible(true);
+
+        $this->assertSame(['a', 'b', 'c'], array_keys($types->getValue($container)));
+        $this->assertSame(['a', 'b', 'c'], array_keys($parameters->getValue($container)));
+    }
+
     private function withContainer(array $values, \Closure $suite)
     {
         $suite($this->getContainer($values));