Merge d6955e7 into 1e66b9d

pel · Apr 21, 2016 · a164084 · a164084
2 parents 1e66b9d + d6955e7
commit a164084
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 13 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/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;
@@ -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/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