Apply fixes with regard to new PHPStan rules (#56)

ildyria · web-flow · commit bc0e753f67a1 · 2022-12-04T14:31:36.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,7 @@ root = true
 charset = utf-8
 end_of_line = lf
 insert_final_newline = false
-indent_style = tab
+indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
diff --git a/lib/PHPExif/Adapter/AbstractAdapter.php b/lib/PHPExif/Adapter/AbstractAdapter.php
@@ -14,7 +14,7 @@
  * @category    PHPExif
  * @package     Reader
  */
-abstract class AdapterAbstract implements AdapterInterface
+abstract class AbstractAdapter implements AdapterInterface
 {
     protected string $hydratorClass = '\\PHPExif\\Hydrator\\Mutator';
     protected ?MapperInterface $mapper = null;
diff --git a/lib/PHPExif/Adapter/Exiftool.php b/lib/PHPExif/Adapter/Exiftool.php
@@ -20,7 +20,7 @@
  * @category    PHPExif
  * @package     Reader
  */
-class Exiftool extends AdapterAbstract
+class Exiftool extends AbstractAdapter
 {
     const TOOL_NAME = 'exiftool';
 
diff --git a/lib/PHPExif/Adapter/FFprobe.php b/lib/PHPExif/Adapter/FFprobe.php
@@ -29,7 +29,7 @@
  * @category    PHPExif
  * @package     Reader
  */
-class FFprobe extends AdapterAbstract
+class FFprobe extends AbstractAdapter
 {
     public const TOOL_NAME = 'ffprobe';
 
diff --git a/lib/PHPExif/Adapter/ImageMagick.php b/lib/PHPExif/Adapter/ImageMagick.php
@@ -18,7 +18,7 @@
  * @category    PHPExif
  * @package     Reader
  */
-class ImageMagick extends AdapterAbstract
+class ImageMagick extends AbstractAdapter
 {
     const TOOL_NAME = 'imagick';
 
diff --git a/lib/PHPExif/Adapter/Native.php b/lib/PHPExif/Adapter/Native.php
@@ -18,7 +18,7 @@
  * @category    PHPExif
  * @package     Reader
  */
-class Native extends AdapterAbstract
+class Native extends AbstractAdapter
 {
     const INCLUDE_THUMBNAIL = true;
     const NO_THUMBNAIL      = false;
diff --git a/lib/PHPExif/Mapper/AbstractMapper.php b/lib/PHPExif/Mapper/AbstractMapper.php
@@ -10,8 +10,10 @@
  * @category    PHPExif
  * @package     Mapper
  */
-abstract class MapperAbstract implements MapperInterface
+abstract class AbstractMapper implements MapperInterface
 {
+    public const ROUNDING_PRECISION = 12;
+
     /**
      * Trim whitespaces recursively
      *
diff --git a/lib/PHPExif/Mapper/Exiftool.php b/lib/PHPExif/Mapper/Exiftool.php
@@ -25,7 +25,7 @@
  * @category    PHPExif
  * @package     Mapper
  */
-class Exiftool extends MapperAbstract
+class Exiftool extends AbstractMapper
 {
     public const APERTURE                 = 'Composite:Aperture';
     public const APPROXIMATEFOCUSDISTANCE = 'XMP-aux:ApproximateFocusDistance';
@@ -382,7 +382,8 @@ public function mapRawData(array $data): array
 
         // add GPS coordinates, if available
         if ((isset($mappedData[Exif::LATITUDE])) && (isset($mappedData[Exif::LONGITUDE]))) {
-            $mappedData[Exif::GPS] = sprintf('%s,%s', $mappedData[Exif::LATITUDE], $mappedData[Exif::LONGITUDE]);
+            $mappedData[Exif::GPS] =
+                sprintf('%s,%s', (string) $mappedData[Exif::LATITUDE], (string) $mappedData[Exif::LONGITUDE]);
         }
 
         return $mappedData;
diff --git a/lib/PHPExif/Mapper/FFprobe.php b/lib/PHPExif/Mapper/FFprobe.php
@@ -15,7 +15,7 @@
  * @category    PHPExif
  * @package     Mapper
  */
-class FFprobe extends MapperAbstract
+class FFprobe extends AbstractMapper
 {
     const HEIGHT           = 'height';
     const WIDTH            = 'width';
@@ -171,7 +171,11 @@ public function mapRawData(array $data) : array
 
         // add GPS coordinates, if available
         if ((isset($mappedData[Exif::LATITUDE])) && (isset($mappedData[Exif::LONGITUDE]))) {
-            $mappedData[Exif::GPS] = sprintf('%s,%s', $mappedData[Exif::LATITUDE], $mappedData[Exif::LONGITUDE]);
+            $mappedData[Exif::GPS] = sprintf(
+                '%s,%s',
+                (string) $mappedData[Exif::LATITUDE],
+                (string) $mappedData[Exif::LONGITUDE]
+            );
         }
 
         // Swap width and height if needed
diff --git a/lib/PHPExif/Mapper/ImageMagick.php b/lib/PHPExif/Mapper/ImageMagick.php
@@ -17,7 +17,7 @@
  * @category    PHPExif
  * @package     Mapper
  */
-class ImageMagick extends MapperAbstract
+class ImageMagick extends AbstractMapper
 {
     const APERTURE                 = 'exif:FNumber';
     const ARTIST                   = 'exif:Artist';
@@ -264,7 +264,8 @@ public function mapRawData(array $data) : array
 
         // add GPS coordinates, if available
         if ((isset($mappedData[Exif::LATITUDE])) && (isset($mappedData[Exif::LONGITUDE]))) {
-            $mappedData[Exif::GPS] = sprintf('%s,%s', $mappedData[Exif::LATITUDE], $mappedData[Exif::LONGITUDE]);
+            $mappedData[Exif::GPS] =
+                sprintf('%s,%s', (string) $mappedData[Exif::LATITUDE], (string) $mappedData[Exif::LONGITUDE]);
         }
         return $mappedData;
     }
diff --git a/lib/PHPExif/Mapper/MapperInterface.php b/lib/PHPExif/Mapper/MapperInterface.php
@@ -15,8 +15,6 @@
  */
 interface MapperInterface
 {
-    public const ROUNDING_PRECISION = 12;
-
     /**
      * Maps the array of raw source data to the correct
      * fields for the \PHPExif\Exif class
diff --git a/lib/PHPExif/Mapper/Native.php b/lib/PHPExif/Mapper/Native.php
@@ -16,7 +16,7 @@
  * @category    PHPExif
  * @package     Mapper
  */
-class Native extends MapperAbstract
+class Native extends AbstractMapper
 {
     const APERTUREFNUMBER  = 'ApertureFNumber';
     const ARTIST           = 'Artist';
@@ -294,7 +294,8 @@ public function mapRawData(array $data) : array
 
         // add GPS coordinates, if available
         if ((isset($mappedData[Exif::LATITUDE])) && (isset($mappedData[Exif::LONGITUDE]))) {
-            $mappedData[Exif::GPS] = sprintf('%s,%s', $mappedData[Exif::LATITUDE], $mappedData[Exif::LONGITUDE]);
+            $mappedData[Exif::GPS] =
+                sprintf('%s,%s', (string) $mappedData[Exif::LATITUDE], (string) $mappedData[Exif::LONGITUDE]);
         }
 
         return $mappedData;
diff --git a/tests/PHPExif/Adapter/AdapterAbstractTest.php b/tests/PHPExif/Adapter/AdapterAbstractTest.php
@@ -4,9 +4,9 @@
 use PHPExif\Adapter\Native;
 
 /**
- * @covers \PHPExif\Adapter\AdapterAbstract::<!public>
+ * @covers \PHPExif\Adapter\AbstractAdapter::<!public>
  */
-class AdapterAbstractTest extends PHPUnit\Framework\TestCase
+class AbstractAdapterTest extends PHPUnit\Framework\TestCase
 {
     /**
      * @var \PHPExif\Adapter\Exiftool|\PHPExif\Adapter\Native
@@ -20,7 +20,7 @@ protected function setUp(): void
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setOptions
+     * @covers \PHPExif\Adapter\AbstractAdapter::setOptions
      */
     public function testSetOptionsReturnsCurrentInstance()
     {
@@ -30,7 +30,7 @@ public function testSetOptionsReturnsCurrentInstance()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setOptions
+     * @covers \PHPExif\Adapter\AbstractAdapter::setOptions
      */
     public function testSetOptionsCorrectlySetsProperties()
     {
@@ -50,7 +50,7 @@ public function testSetOptionsCorrectlySetsProperties()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setOptions
+     * @covers \PHPExif\Adapter\AbstractAdapter::setOptions
      */
     public function testSetOptionsIgnoresPropertiesWithoutSetters()
     {
@@ -69,7 +69,7 @@ public function testSetOptionsIgnoresPropertiesWithoutSetters()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::__construct
+     * @covers \PHPExif\Adapter\AbstractAdapter::__construct
      */
     public function testConstructorSetsOptions()
     {
@@ -89,7 +89,7 @@ public function testConstructorSetsOptions()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setMapper
+     * @covers \PHPExif\Adapter\AbstractAdapter::setMapper
      */
     public function testSetMapperReturnsCurrentInstance()
     {
@@ -100,34 +100,34 @@ public function testSetMapperReturnsCurrentInstance()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setMapper
+     * @covers \PHPExif\Adapter\AbstractAdapter::setMapper
      */
     public function testSetMapperCorrectlySetsInProperty()
     {
         $mapper = new \PHPExif\Mapper\Native();
         $this->adapter->setMapper($mapper);
 
-        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AdapterAbstract', 'mapper');
+        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AbstractAdapter', 'mapper');
         $reflProp->setAccessible(true);
         $this->assertSame($mapper, $reflProp->getValue($this->adapter));
     }
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getMapper
+     * @covers \PHPExif\Adapter\AbstractAdapter::getMapper
      */
     public function testGetMapperCorrectlyReturnsFromProperty()
     {
         $mapper = new \PHPExif\Mapper\Native();
-        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AdapterAbstract', 'mapper');
+        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AbstractAdapter', 'mapper');
         $reflProp->setAccessible(true);
         $reflProp->setValue($this->adapter, $mapper);
         $this->assertSame($mapper, $this->adapter->getMapper());
     }
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getMapper
+     * @covers \PHPExif\Adapter\AbstractAdapter::getMapper
      */
     public function testGetMapperLazyLoadsMapperWhenNotPresent()
     {
@@ -145,7 +145,7 @@ public function testGetMapperLazyLoadsMapperWhenNotPresent()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getMapper
+     * @covers \PHPExif\Adapter\AbstractAdapter::getMapper
      */
     public function testGetMapperLazyLoadingSetsInProperty()
     {
@@ -169,7 +169,7 @@ public function testGetMapperLazyLoadingSetsInProperty()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setHydrator
+     * @covers \PHPExif\Adapter\AbstractAdapter::setHydrator
      */
     public function testSetHydratorReturnsCurrentInstance()
     {
@@ -180,34 +180,34 @@ public function testSetHydratorReturnsCurrentInstance()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::setHydrator
+     * @covers \PHPExif\Adapter\AbstractAdapter::setHydrator
      */
     public function testSetHydratorCorrectlySetsInProperty()
     {
         $hydrator = new \PHPExif\Hydrator\Mutator();
         $this->adapter->setHydrator($hydrator);
 
-        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AdapterAbstract', 'hydrator');
+        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AbstractAdapter', 'hydrator');
         $reflProp->setAccessible(true);
         $this->assertSame($hydrator, $reflProp->getValue($this->adapter));
     }
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getHydrator
+     * @covers \PHPExif\Adapter\AbstractAdapter::getHydrator
      */
     public function testGetHydratorCorrectlyReturnsFromProperty()
     {
         $hydrator = new \PHPExif\Hydrator\Mutator();
-        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AdapterAbstract', 'hydrator');
+        $reflProp = new \ReflectionProperty('\\PHPExif\\Adapter\\AbstractAdapter', 'hydrator');
         $reflProp->setAccessible(true);
         $reflProp->setValue($this->adapter, $hydrator);
         $this->assertSame($hydrator, $this->adapter->getHydrator());
     }
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getHydrator
+     * @covers \PHPExif\Adapter\AbstractAdapter::getHydrator
      */
     public function testGetHydratorLazyLoadsHydratorWhenNotPresent()
     {
@@ -217,7 +217,7 @@ public function testGetHydratorLazyLoadsHydratorWhenNotPresent()
 
     /**
      * @group adapter
-     * @covers \PHPExif\Adapter\AdapterAbstract::getHydrator
+     * @covers \PHPExif\Adapter\AbstractAdapter::getHydrator
      */
     public function testGetHydratorLazyLoadingSetsInProperty()
     {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* @category PHPExif`
`15`	`15`	`* @package Reader`
`16`	`16`	`*/`
`17`		`-abstract class AdapterAbstract implements AdapterInterface`
	`17`	`+abstract class AbstractAdapter implements AdapterInterface`
`18`	`18`	`{`
`19`	`19`	`protected string $hydratorClass = '\\PHPExif\\Hydrator\\Mutator';`
`20`	`20`	`protected ?MapperInterface $mapper = null;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* @category PHPExif`
`21`	`21`	`* @package Reader`
`22`	`22`	`*/`
`23`		`-class Exiftool extends AdapterAbstract`
	`23`	`+class Exiftool extends AbstractAdapter`
`24`	`24`	`{`
`25`	`25`	`const TOOL_NAME = 'exiftool';`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* @category PHPExif`
`30`	`30`	`* @package Reader`
`31`	`31`	`*/`
`32`		`-class FFprobe extends AdapterAbstract`
	`32`	`+class FFprobe extends AbstractAdapter`
`33`	`33`	`{`
`34`	`34`	`public const TOOL_NAME = 'ffprobe';`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* @category PHPExif`
`19`	`19`	`* @package Reader`
`20`	`20`	`*/`
`21`		`-class ImageMagick extends AdapterAbstract`
	`21`	`+class ImageMagick extends AbstractAdapter`
`22`	`22`	`{`
`23`	`23`	`const TOOL_NAME = 'imagick';`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,10 @@`
`10`	`10`	`* @category PHPExif`
`11`	`11`	`* @package Mapper`
`12`	`12`	`*/`
`13`		`-abstract class MapperAbstract implements MapperInterface`
	`13`	`+abstract class AbstractMapper implements MapperInterface`
`14`	`14`	`{`
	`15`	`+ public const ROUNDING_PRECISION = 12;`
	`16`	`+`
`15`	`17`	`/**`
`16`	`18`	`* Trim whitespaces recursively`
`17`	`19`	`*`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`* @category PHPExif`
`18`	`18`	`* @package Mapper`
`19`	`19`	`*/`
`20`		`-class ImageMagick extends MapperAbstract`
	`20`	`+class ImageMagick extends AbstractMapper`
`21`	`21`	`{`
`22`	`22`	`const APERTURE = 'exif:FNumber';`
`23`	`23`	`const ARTIST = 'exif:Artist';`
`@@ -264,7 +264,8 @@ public function mapRawData(array $data) : array`
`264`	`264`
`265`	`265`	`// add GPS coordinates, if available`
`266`	`266`	`if ((isset($mappedData[Exif::LATITUDE])) && (isset($mappedData[Exif::LONGITUDE]))) {`
`267`		`- $mappedData[Exif::GPS] = sprintf('%s,%s', $mappedData[Exif::LATITUDE], $mappedData[Exif::LONGITUDE]);`
	`267`	`+ $mappedData[Exif::GPS] =`
	`268`	`+ sprintf('%s,%s', (string) $mappedData[Exif::LATITUDE], (string) $mappedData[Exif::LONGITUDE]);`
`268`	`269`	`}`
`269`	`270`	`return $mappedData;`
`270`	`271`	`}`