c

mondrake · Jan 24, 2024 · 138c3c0 · 138c3c0
1 parent 4743928
commit 138c3c0
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/specs/Exif/Exif.yaml → specs/Jpeg/Exif.yaml b/specs/Exif/Exif.yaml → specs/Jpeg/Exif.yaml
@@ -1,6 +1,6 @@
-collection: Exif\Exif
+collection: Jpeg\Exif
 title: 'JPEG Exif data'
-class: FileEye\MediaProbe\Block\Exif\Exif
+class: FileEye\MediaProbe\Block\Jpeg\Exif
 DOMNode: exif
 items:
     Tiff:

diff --git a/src/Block/Exif/Exif.php → src/Block/Jpeg/Exif.php b/src/Block/Exif/Exif.php → src/Block/Jpeg/Exif.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FileEye\MediaProbe\Block\Exif;
+namespace FileEye\MediaProbe\Block\Jpeg;
 
 use FileEye\MediaProbe\Model\BlockBase;
 use FileEye\MediaProbe\Collection\CollectionFactory;

diff --git a/src/Block/Jpeg/SegmentApp1.php b/src/Block/Jpeg/SegmentApp1.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Block\Jpeg;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Collection\CollectionFactory;
 use FileEye\MediaProbe\Data\DataElement;
 use FileEye\MediaProbe\Entry\Core\Undefined;

diff --git a/src/Collection/CollectionIndex.php b/src/Collection/CollectionIndex.php
@@ -145,8 +145,8 @@ public function getNamespace(): string
     'ExifMakerNotes\\Canon\\VignettingCorr2' => 'ExifMakerNotes\\Canon\\VignettingCorr2',
     'ExifMakerNotes\\Canon\\VignettingCorrUnknown' => 'ExifMakerNotes\\Canon\\VignettingCorrUnknown',
     'ExifMakerNotes\\MakerNotes' => 'ExifMakerNotes\\MakerNotes',
-    'Exif\\Exif' => 'Exif\\Exif',
     'Format' => 'Format',
+    'Jpeg\\Exif' => 'Jpeg\\Exif',
     'Jpeg\\Jpeg' => 'Jpeg\\Jpeg',
     'Jpeg\\Segment' => 'Jpeg\\Segment',
     'Jpeg\\SegmentApp1' => 'Jpeg\\SegmentApp1',
@@ -301,13 +301,13 @@ public function getNamespace(): string
     'ExifIFD' => 'Tiff\\IfdExif',
     'ExifMakerNotes\\Canon\\Filter' => 'ExifMakerNotes\\Canon\\Filter',
     'ExifMakerNotes\\MakerNotes' => 'ExifMakerNotes\\MakerNotes',
-    'Exif\\Exif' => 'Exif\\Exif',
     'Format' => 'Format',
     'GPS' => 'Tiff\\IfdGps',
     'IFD0' => 'Tiff\\Ifd0',
     'IFD1' => 'Tiff\\Ifd1',
     'Interop' => 'Tiff\\IfdInteroperability',
     'InteropIFD' => 'Tiff\\IfdInteroperability',
+    'Jpeg\\Exif' => 'Jpeg\\Exif',
     'Jpeg\\Jpeg' => 'Jpeg\\Jpeg',
     'Jpeg\\Segment' => 'Jpeg\\Segment',
     'Main' => 'Tiff\\Ifd0',

diff --git a/src/Collection/Exif/Exif.php → src/Collection/Jpeg/Exif.php b/src/Collection/Exif/Exif.php → src/Collection/Jpeg/Exif.php
@@ -6,17 +6,17 @@
  */
 // phpcs:disable
 
-namespace FileEye\MediaProbe\Collection\Exif;
+namespace FileEye\MediaProbe\Collection\Jpeg;
 
 use FileEye\MediaProbe\Collection\CollectionBase;
 
 class Exif extends CollectionBase {
 
   protected static $map = array (
   'title' => 'JPEG Exif data',
-  'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Exif',
+  'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\Exif',
   'DOMNode' => 'exif',
-  'id' => 'Exif\\Exif',
+  'id' => 'Jpeg\\Exif',
   'items' =>
   array (
     'Tiff' =>

diff --git a/src/Command/DumpCommand.php b/src/Command/DumpCommand.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Command;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Block\Tiff\Ifd;
 use FileEye\MediaProbe\Block\Jpeg\Jpeg;
 use FileEye\MediaProbe\Block\Tiff\Tag;

diff --git a/tests/Bug3017880Test.php b/tests/Bug3017880Test.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Test;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Block\Tiff\Ifd;
 use FileEye\MediaProbe\Block\Jpeg\Jpeg;
 use FileEye\MediaProbe\Block\Tiff\Tag;

diff --git a/tests/GH16Test.php b/tests/GH16Test.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Test;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Block\Tiff\Ifd;
 use FileEye\MediaProbe\Block\Jpeg\Jpeg;
 use FileEye\MediaProbe\Block\Tiff\Tag;

diff --git a/tests/GH21Test.php b/tests/GH21Test.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Test;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Block\Jpeg\Jpeg;
 use FileEye\MediaProbe\Block\Jpeg\SegmentApp1;
 use FileEye\MediaProbe\Collection\CollectionFactory;

diff --git a/tests/MisplacedExifTest.php b/tests/MisplacedExifTest.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Test;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Block\Jpeg\Jpeg;
 use FileEye\MediaProbe\Block\Jpeg\SegmentApp1;
 use FileEye\MediaProbe\Collection\CollectionFactory;

diff --git a/tests/ReadWriteTest.php b/tests/ReadWriteTest.php
@@ -2,7 +2,7 @@
 
 namespace FileEye\MediaProbe\Test;
 
-use FileEye\MediaProbe\Block\Exif\Exif;
+use FileEye\MediaProbe\Block\Jpeg\Exif;
 use FileEye\MediaProbe\Block\Tiff\Ifd;
 use FileEye\MediaProbe\Block\Jpeg\Jpeg;
 use FileEye\MediaProbe\Block\Jpeg\SegmentApp1;