Merge 4b5ba7d into 1e66b9d

pel · Apr 21, 2016 · 33b08b0 · 33b08b0
2 parents 1e66b9d + 4b5ba7d
commit 33b08b0
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 26 deletions.
diff --git a/autoload.php b/autoload.php
@@ -33,4 +33,4 @@
             include_once realpath($load);
         }
     }
-});
+});
diff --git a/composer.json b/composer.json
@@ -25,7 +25,6 @@
         "php": ">=5.0.0"
     },
     "require-dev" : {
-        "php": ">=5.5.0",
         "ext-gd": "*",
         "phpunit/phpunit": "4.4.*",
         "squizlabs/php_codesniffer": "2.*",

diff --git a/examples/gps.php b/examples/gps.php
@@ -36,7 +36,6 @@
  */
 require_once '../autoload.php';
 
-use lsolesen\pel\PelDataWindow;
 use lsolesen\pel\PelJpeg;
 use lsolesen\pel\PelTiff;
 

diff --git a/examples/resize.php b/examples/resize.php
@@ -38,9 +38,7 @@ function println($args)
 /* Load the required PEL files for handling JPEG images. */
 require_once '../autoload.php';
 
-use lsolesen\pel\PelDataWindow;
 use lsolesen\pel\PelJpeg;
-use lsolesen\pel\PelTiff;
 
 /*
  * Store the name of the script in $prog and remove this first part of

diff --git a/makepackagexml.php b/makepackagexml.php
@@ -78,7 +78,7 @@
 
 $pfm->generateContents();
 
-if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) {
+if (isset($_GET['make']) || (isset($_SERVER['argv']) && $_SERVER['argv'][1] == 'make')) {
     if ($pfm->writePackageFile()) {
         exit('package created');
     }

diff --git a/src/PelEntryTime.php b/src/PelEntryTime.php
@@ -206,8 +206,6 @@ public function getValue($type = self::UNIX_TIMESTAMP)
      */
     public function setValue($timestamp, $type = self::UNIX_TIMESTAMP)
     {
-        // if (empty($timestamp))
-        // debug_print_backtrace();
         switch ($type) {
             case self::UNIX_TIMESTAMP:
                 $this->day_count = $this->convertUnixToJd($timestamp);

diff --git a/src/PelIfd.php b/src/PelIfd.php
@@ -965,7 +965,7 @@ public function getIterator()
      */
     public function getThumbnailData()
     {
-        if ($this->thumb_data != null) {
+        if ($this->thumb_data !== null) {
             return $this->thumb_data->getBytes();
         } else {
             return '';
@@ -1002,7 +1002,7 @@ public function getNextIfd()
      */
     public function isLastIfd()
     {
-        return $this->next == null;
+        return $this->next === null;
     }
 
     /**
@@ -1074,7 +1074,7 @@ public function getBytes($offset, $order)
         Pel::debug('Bytes from IDF will start at offset %d within Exif data', $offset);
 
         $n = count($this->entries) + count($this->sub);
-        if ($this->thumb_data != null) {
+        if ($this->thumb_data !== null) {
             /*
              * We need two extra entries for the thumbnail offset and
              * length.
@@ -1119,7 +1119,7 @@ public function getBytes($offset, $order)
             }
         }
 
-        if ($this->thumb_data != null) {
+        if ($this->thumb_data !== null) {
             Pel::debug('Appending %d bytes of thumbnail data at %d', $this->thumb_data->getSize(), $end);
             // TODO: make PelEntry a class that can be constructed with
             // arguments corresponding to the newt four lines.
@@ -1199,7 +1199,7 @@ public function __toString()
         foreach ($this->sub as $type => $ifd) {
             $str .= $ifd->__toString();
         }
-        if ($this->next != null) {
+        if ($this->next !== null) {
             $str .= $this->next->__toString();
         }
         return $str;

diff --git a/src/PelTiff.php b/src/PelTiff.php
@@ -222,7 +222,7 @@ public function getBytes($order = PelConvert::LITTLE_ENDIAN)
         /* TIFF magic number --- fixed value. */
         $bytes .= PelConvert::shortToBytes(self::TIFF_HEADER, $order);
 
-        if ($this->ifd != null) {
+        if ($this->ifd !== null) {
             /*
              * IFD 0 offset. We will always start IDF 0 at an offset of 8
              * bytes (2 bytes for byte order, another 2 bytes for the TIFF
@@ -254,7 +254,7 @@ public function getBytes($order = PelConvert::LITTLE_ENDIAN)
     public function __toString()
     {
         $str = Pel::fmt("Dumping TIFF data...\n");
-        if ($this->ifd != null) {
+        if ($this->ifd !== null) {
             $str .= $this->ifd->__toString();
         }
 

diff --git a/test/Bug1730993Test.php b/test/Bug1730993Test.php
@@ -39,7 +39,7 @@ function testThisDoesNotWorkAsExpected()
             require_once 'PelJpeg.php';
             $jpeg = new PelJpeg($tmpfile); // the error occurs here
             $exif = $jpeg->getExif();
-            if ($exif != null) {
+            if ($exif !== null) {
                 $jpeg1 = new PelJpeg($bigfile);
                 $jpeg1->setExif($exif);
                 file_put_contents($bigfile, $jpeg1->getBytes());

diff --git a/test/Bug3017880Test.php b/test/Bug3017880Test.php
@@ -24,7 +24,6 @@
  */
 
 use lsolesen\pel\PelJpeg;
-use lsolesen\pel\PelEntryTime;
 use lsolesen\pel\PelExif;
 use lsolesen\pel\PelTiff;
 use lsolesen\pel\PelIfd;
@@ -55,15 +54,15 @@ function testThisDoesNotWorkAsExpected()
 
             $tiff = $exif->getTiff();
             $ifd0 = $tiff->getIfd();
-            if ($ifd0 == null) {
+            if ($ifd0 === null) {
                 $ifd0 = new PelIfd(PelIfd::IFD0);
                 $tiff->setIfd($ifd0);
             }
 
             $software_name = 'Example V2';
             $software = $ifd0->getEntry(PelTag::SOFTWARE);
 
-            if ($software == null) {
+            if ($software === null) {
                 $software = new PelEntryAscii(PelTag::SOFTWARE, $software_name);
                 $ifd0->addEntry($software);
                 $resave_file = 1;
@@ -74,7 +73,6 @@ function testThisDoesNotWorkAsExpected()
 
             if ($resave_file == 1 && ! file_put_contents($filename, $jpeg->getBytes())) {
                 // if it was okay to resave the file, but it did not save correctly
-                $success = 0;
             }
         } catch (Exception $e) {
             $this->fail('Test should not throw an exception');

diff --git a/test/ConvertTest.php b/test/ConvertTest.php
@@ -71,7 +71,9 @@ function testLongBig()
     function testSLongLittle()
     {
         // TODO: Does not work on 64bit systems!
-        return;
+        $this->markTestIncomplete(
+            'Does not work on 64bit systems!'
+        );
         $o = PelConvert::LITTLE_ENDIAN;
 
         /*
@@ -98,7 +100,9 @@ function testSLongLittle()
     function testSLongBig()
     {
         // TODO: Does not work on 64bit systems
-        return;
+        $this->markTestIncomplete(
+            'Does not work on 64bit systems!'
+        );
 
         $o = PelConvert::BIG_ENDIAN;
 

diff --git a/test/GH16Test.php b/test/GH16Test.php
@@ -55,7 +55,7 @@ function testThisDoesNotWorkAsExpected()
             $jpeg->load($data);
             $exif = $jpeg->getExif();
 
-            if (null == $exif) {
+            if (null === $exif) {
                 $exif = new PelExif();
                 $jpeg->setExif($exif);
                 $tiff = new PelTiff();
@@ -65,7 +65,7 @@ function testThisDoesNotWorkAsExpected()
             $tiff = $exif->getTiff();
 
             $ifd0 = $tiff->getIfd();
-            if (null == $ifd0) {
+            if (null === $ifd0) {
                 $ifd0 = new PelIfd(PelIfd::IFD0);
                 $tiff->setIfd($ifd0);
             }

diff --git a/test/GH21Test.php b/test/GH21Test.php
@@ -70,7 +70,7 @@ function testThisDoesNotWorkAsExpected()
 
         $exif = $input_jpeg->getExif();
 
-        if ($exif != null) {
+        if ($exif !== null) {
             $output_jpeg->setExif($exif);
         }
 

diff --git a/test/NumberTest.php b/test/NumberTest.php
@@ -32,7 +32,6 @@
 use \lsolesen\pel\PelEntrySLong;
 use \lsolesen\pel\PelEntryRational;
 use \lsolesen\pel\PelEntrySRational;
-use \lsolesen\pel\PelEntryUndefined;
 use \lsolesen\pel\PelOverflowException;
 
 abstract class NumberTest extends \PHPUnit_Framework_TestCase