Fix CS

.github/workflows/tests.yml

@@ -15,9 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.2"
+          #- "8.2"
           - "8.3"
-          - "8.4"
+          #- "8.4"
 
     steps:
     - name: Install PHP
@@ -67,9 +67,8 @@ jobs:
 #      continue-on-error: true
       run: vendor/bin/phpunit --color=always --testdox --display-deprecations --display-phpunit-deprecations ./tests
 
-#    - name: Code style test
-#      if: ${{ matrix.php-version == 7.4 }}
-#      run: ./vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
+    - name: Code style test
+      run: ./vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
 
 # Remove the comment to the lines below during development, to refresh the
 # media file dumps.

.gitignore

@@ -2,3 +2,4 @@
 composer.lock
 .DS_Store
 .phpunit*
+.phpcs-cache

composer.json

@@ -33,7 +33,8 @@
         "symfony/finder": "^7.2",
         "symfony/process": "^7.2",
         "symfony/var-dumper": "^7.2",
-        "symfony/yaml": "^7.2"
+        "symfony/yaml": "^7.2",
+        "slevomat/coding-standard": "^8.15"
     },
     "autoload": {
         "psr-4": {
@@ -48,7 +49,8 @@
     "bin": ["bin/fileeye-mediaprobe"],
     "config": {
         "allow-plugins": {
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }

phpcs.xml

@@ -22,4 +22,13 @@
     <rule ref="Generic.Arrays.DisallowLongArraySyntax.Found">
         <type>error</type>
     </rule>
+
+    <config name="installed_paths" value="../../slevomat/coding-standard"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+        <properties>
+            <property name="searchAnnotations" value="true" />
+        </properties>
+    </rule>
+
 </ruleset>

src/Block/Exif/Vendor/Apple/MakerNote.php

@@ -2,21 +2,16 @@
 
 namespace FileEye\MediaProbe\Block\Exif\Vendor\Apple;
 
-use FileEye\MediaProbe\Block\Tiff\Ifd;
 use FileEye\MediaProbe\Block\ListBase;
 use FileEye\MediaProbe\Block\RawData;
+use FileEye\MediaProbe\Block\Tiff\Ifd;
 use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Collection\CollectionFactory;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataException;
+use FileEye\MediaProbe\Data\DataFormat;
 use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\Model\BlockInterface;
-use FileEye\MediaProbe\Model\ElementInterface;
-use FileEye\MediaProbe\Model\EntryInterface;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\MediaProbe;
-use FileEye\MediaProbe\MediaProbeException;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
 class MakerNote extends Ifd

src/Block/Exif/Vendor/Apple/RunTime.php

@@ -9,9 +9,7 @@
 use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataString;
-use FileEye\MediaProbe\Data\DataWindow;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\MediaProbe;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
 class RunTime extends ListBase

src/Block/Exif/Vendor/Canon/AFInfoIndex.php

@@ -3,12 +3,7 @@
 namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon;
 
 use FileEye\MediaProbe\Block\Index;
-use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
-use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**
  * Class representing an index of values, for Canon AFInfo e AFInfo2.

src/Block/Exif/Vendor/Canon/CameraInfoMap.php

@@ -2,13 +2,10 @@
 
 namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon;
 
-use FileEye\MediaProbe\Block\Index;
 use FileEye\MediaProbe\Block\Map;
-use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
-use FileEye\MediaProbe\ItemDefinition;
 use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\Utility\ConvertBytes;
+use FileEye\MediaProbe\ItemDefinition;
 
 /**
  * Class representing a map of values, for Canon Camera information.

src/Block/Exif/Vendor/Canon/ColorDataMap.php

@@ -2,13 +2,9 @@
 
 namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon;
 
-use FileEye\MediaProbe\Block\Index;
 use FileEye\MediaProbe\Block\Map;
-use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**
  * Class representing a map of values, for Canon ColorData information.

src/Block/Exif/Vendor/Canon/CustomFunctions2.php

@@ -6,13 +6,9 @@
 use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataException;
+use FileEye\MediaProbe\Data\DataFormat;
 use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\Model\ElementInterface;
-use FileEye\MediaProbe\Model\EntryInterface;
-use FileEye\MediaProbe\Entry\Core\Undefined;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\MediaProbe;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**

src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php

@@ -6,13 +6,8 @@
 use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataException;
-use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\Model\ElementInterface;
-use FileEye\MediaProbe\Model\EntryInterface;
-use FileEye\MediaProbe\Entry\Core\Undefined;
-use FileEye\MediaProbe\ItemDefinition;
 use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\MediaProbe;
+use FileEye\MediaProbe\ItemDefinition;
 use FileEye\MediaProbe\MediaProbeException;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 

src/Block/Exif/Vendor/Canon/Filter.php

@@ -2,17 +2,12 @@
 
 namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon;
 
-use FileEye\MediaProbe\Block\Index;
 use FileEye\MediaProbe\Block\ListBase;
-use FileEye\MediaProbe\Block\Map;
-use FileEye\MediaProbe\Block\RawData;
 use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataFormat;
 use FileEye\MediaProbe\Data\DataWindow;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\MediaProbe;
-use FileEye\MediaProbe\MediaProbeException;
 use FileEye\MediaProbe\Model\BlockInterface;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
@@ -35,8 +30,7 @@ public function __construct(
         ItemDefinition $definition,
         FilterInfoIndex $parent,
         ?BlockInterface $reference = null,
-    )
-    {
+    ) {
         parent::__construct($definition, $parent, $reference);
         $this->setAttribute('name', $this->getParentElement()->getAttribute('name') . '.' . $definition->sequence);
     }

src/Block/Exif/Vendor/Canon/FilterInfoIndex.php

@@ -3,16 +3,12 @@
 namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon;
 
 use FileEye\MediaProbe\Block\Index;
-use FileEye\MediaProbe\Block\Map;
 use FileEye\MediaProbe\Block\RawData;
-use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Collection\CollectionFactory;
 use FileEye\MediaProbe\Data\DataElement;
+use FileEye\MediaProbe\Data\DataFormat;
 use FileEye\MediaProbe\Data\DataWindow;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\MediaProbe;
-use FileEye\MediaProbe\MediaProbeException;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**

src/Block/Index.php

@@ -5,10 +5,9 @@
 use FileEye\MediaProbe\Block\Tiff\Tag;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataException;
+use FileEye\MediaProbe\Data\DataFormat;
 use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\MediaProbe;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Data\DataFormat;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**

src/Block/Jpeg/Exif.php

@@ -6,9 +6,9 @@
 use FileEye\MediaProbe\Collection\CollectionFactory;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Entry\Core\Undefined;
+use FileEye\MediaProbe\ItemDefinition;
 use FileEye\MediaProbe\Model\BlockBase;
 use FileEye\MediaProbe\Utility\ConvertBytes;
-use FileEye\MediaProbe\ItemDefinition;
 
 /**
  * Class representing Exif data.

src/Block/ListBase.php

@@ -3,16 +3,6 @@
 namespace FileEye\MediaProbe\Block;
 
 use FileEye\MediaProbe\Model\BlockBase;
-use FileEye\MediaProbe\Block\Tiff\Tag;
-use FileEye\MediaProbe\Data\DataElement;
-use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\Data\DataException;
-use FileEye\MediaProbe\Model\ElementInterface;
-use FileEye\MediaProbe\Model\EntryInterface;
-use FileEye\MediaProbe\MediaProbe;
-use FileEye\MediaProbe\MediaProbeException;
-use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**
  * Abstract class representing a generic table of data.

src/Block/Map.php

@@ -7,10 +7,7 @@
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataException;
 use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\Data\DataString;
-use FileEye\MediaProbe\Data\DataWindow;
 use FileEye\MediaProbe\ItemDefinition;
-use FileEye\MediaProbe\MediaProbe;
 use FileEye\MediaProbe\Model\BlockBase;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
@@ -34,8 +31,7 @@ public function __construct(
         ItemDefinition $definition,
         ?BlockBase $parent = null,
         ?BlockBase $reference = null,
-    )
-    {
+    ) {
         parent::__construct($definition, $parent, $reference);
         $this->components = $definition->valuesCount;
         $this->format = $definition->format;
@@ -60,8 +56,8 @@ protected function doParseData(DataElement $data): void
 
             // Check data is accessible, notice otherwise.
             if ($item_definition->dataOffset >= $data->getSize()) {
-                $this->info(
-                    'Could not access value for \'{item}\' in map \'{map}\', overflow',
+                $this->debug(
+                    '\'{item}\' in map \'{map}\' is beyond end of data available, skipped',
                     [
                         'item' => $item_definition->collection->getPropertyValue('name'),
                         'map' => $this->getAttribute('name'),
@@ -70,8 +66,8 @@ protected function doParseData(DataElement $data): void
                 continue;
             }
             if ($item_definition->dataOffset +  $item_definition->getSize() > $data->getSize()) {
-                $this->notice(
-                    'Could not get value for \'{item}\' in map \'{map}\', not enough data',
+                $this->warning(
+                    'Failed to get value for \'{item}\' in map \'{map}\', not enough data left',
                     [
                         'item' => $item_definition->collection->getPropertyValue('name'),
                         'map' => $this->getAttribute('name'),

src/Block/RawData.php

@@ -4,9 +4,7 @@
 
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\Data\DataWindow;
 use FileEye\MediaProbe\Entry\Core\Undefined;
-use FileEye\MediaProbe\ItemDefinition;
 use FileEye\MediaProbe\Model\BlockBase;
 use FileEye\MediaProbe\Model\EntryBase;
 use FileEye\MediaProbe\Utility\ConvertBytes;

src/Block/Thumbnail.php

@@ -2,9 +2,9 @@
 
 namespace FileEye\MediaProbe\Block;
 
-use FileEye\MediaProbe\Model\BlockBase;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Entry\Core\Undefined;
+use FileEye\MediaProbe\Model\BlockBase;
 
 /**
  * Class used to hold data for a JPEG Thumbnail.

src/Block/Tiff/Ifd.php

@@ -11,14 +11,10 @@
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Data\DataException;
 use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\Data\DataString;
 use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\Entry\Core\Undefined;
 use FileEye\MediaProbe\ItemDefinition;
 use FileEye\MediaProbe\MediaProbe;
 use FileEye\MediaProbe\MediaProbeException;
-use FileEye\MediaProbe\Model\BlockBase;
-use FileEye\MediaProbe\Model\ElementInterface;
 use FileEye\MediaProbe\Model\EntryInterface;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
@@ -160,8 +156,7 @@ protected function getItemDefinitionFromData(
         int $offset,
         int $data_offset_shift = 0,
         ?string $fallback_collection_id = null,
-    ): ItemDefinition
-    {
+    ): ItemDefinition {
         $id = $dataElement->getShort($offset);
         $format = $dataElement->getShort($offset + 2);
 

src/Block/Tiff/Tag.php

@@ -2,17 +2,13 @@
 
 namespace FileEye\MediaProbe\Block\Tiff;
 
-use FileEye\MediaProbe\Model\BlockBase;
 use FileEye\MediaProbe\Data\DataElement;
-use FileEye\MediaProbe\Data\DataWindow;
-use FileEye\MediaProbe\Model\BlockInterface;
-use FileEye\MediaProbe\Model\ElementInterface;
-use FileEye\MediaProbe\Model\EntryInterface;
-use FileEye\MediaProbe\MediaProbe;
-use FileEye\MediaProbe\MediaProbeException;
 use FileEye\MediaProbe\Data\DataException;
 use FileEye\MediaProbe\Data\DataFormat;
-use FileEye\MediaProbe\ItemDefinition;
+use FileEye\MediaProbe\MediaProbe;
+use FileEye\MediaProbe\Model\BlockBase;
+use FileEye\MediaProbe\Model\BlockInterface;
+use FileEye\MediaProbe\Model\EntryInterface;
 use FileEye\MediaProbe\Utility\ConvertBytes;
 
 /**

src/Collection/CollectionBase.php

@@ -69,20 +69,23 @@ public function listItemIds(): array
      * @return mixed
      *   The item collection index.
      */
-    private function getItemCollectionIndex(string $item_id, ?int $components_count, ElementInterface $context): mixed
-    {
+    private function getItemCollectionIndex(
+        string $item_id,
+        ?int $components_count,
+        ElementInterface $context,
+    ): mixed {
         $entry_class = $this->getPropertyValue('items')[$item_id][0]['entryClass'] ?? null;
         return $entry_class ? $entry_class::resolveItemCollectionIndex($components_count, $context) : 0;
     }
 
     public function getItemCollection(
-        string $item, $index = 0,
+        string $item,
+        $index = 0,
         ?string $default_id = null,
         array $default_properties = [],
         ?int $components_count = null,
         ?ElementInterface $context = null,
-    ): CollectionInterface
-    {
+    ): CollectionInterface {
         if ($index === null) {
             if ($context === null) {
                 $index = 0;