@@ -200,7 +200,7 @@ public function testGetExposure()
200200 public function testGetExposureMilliseconds ()
201201 {
202202 $ rawData = array (
203- array (1 / 300 , '1/300 ' ),
203+ array (1 / 300 , '1/300 ' ),
204204 array (0.0025 , 0.0025 ),
205205 );
206206
@@ -729,10 +729,12 @@ public function testAdapterConsistency()
729729 // find all Getter methods on the results and compare its output
730730 foreach ($ methods as $ method ) {
731731 $ name = $ method ->getName ();
732- if (strpos ($ name , 'get ' ) !== 0 || $ name === 'getRawData ' || $ name === 'getData ' || $ name === 'getColorSpace ' ||
732+ if (
733+ strpos ($ name , 'get ' ) !== 0 || $ name === 'getRawData ' || $ name === 'getData ' || $ name === 'getColorSpace ' ||
733734 ($ name === 'getLens ' && $ file === PHPEXIF_TEST_ROOT . '/files/dsc_5794.jpg ' ) ||
734735 ($ file === PHPEXIF_TEST_ROOT . '/files/mongolia.jpeg ' && ($ name === 'getKeywords ' || $ name === 'getLens ' )) ||
735- ($ file === PHPEXIF_TEST_ROOT . '/files/utf8.jpg ' && ($ name === 'getAuthor ' || $ name === 'getDescription ' ))) {
736+ ($ file === PHPEXIF_TEST_ROOT . '/files/utf8.jpg ' && ($ name === 'getAuthor ' || $ name === 'getDescription ' ))
737+ ) {
736738 continue ;
737739 }
738740 $ result_native = $ result_exif_native ->$ name ();
@@ -744,7 +746,10 @@ public function testAdapterConsistency()
744746 'Adapter difference detected native/exiftool in method " ' . $ name . '" on image " ' . basename ($ file ) . '" '
745747 );
746748
747- if (basename ($ file ) === 'dsc_0003.jpg ' && $ name === 'getGPS ' && $ result_native === '1,1 ' && $ result_imagemagick === false ) {
749+ if (basename ($ file ) === 'dsc_0003.jpg '
750+ && ($ name === 'getGPS ' || $ name === 'getLongitude ' || $ name === 'getLatitude ' )
751+ && ($ result_native === '1,1 ' || $ result_native === '1.0 ' )
752+ && $ result_imagemagick === false ) {
748753 // Skip that test...
749754 // Something is going wrong here, no clue what.
750755 // Suspect it is on php-imagick side.
0 commit comments