From f63bb5bc096721b3f34f8d8b4ccdcd48940de4c6 Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:35:51 +0000 Subject: [PATCH 1/7] Fixed issues pointed out by Insight by SensioLabs --- autoload.php | 2 +- makepackagexml.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload.php b/autoload.php index 361bfe34..f86d0adb 100644 --- a/autoload.php +++ b/autoload.php @@ -33,4 +33,4 @@ include_once realpath($load); } } -}); \ No newline at end of file +}); diff --git a/makepackagexml.php b/makepackagexml.php index fe9629df..24b5939d 100644 --- 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'); } From 2e3a2d7b0f5f17ae2e2f81182bbb5324ccbe9011 Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:37:03 +0000 Subject: [PATCH 2/7] Unused use statement should be avoided --- examples/gps.php | 1 - examples/resize.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/examples/gps.php b/examples/gps.php index a6c2543c..9443a925 100644 --- 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 index 39e6d621..94152a08 100644 --- 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 From 4291e91242944e461fcb29eca682646229e5870e Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:38:58 +0000 Subject: [PATCH 3/7] Commented code should not be committed --- src/PelEntryTime.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/PelEntryTime.php b/src/PelEntryTime.php index 9f9f6f6f..249b482d 100644 --- 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); From 7e0391e6cc76b2cafb5444ef6b26acf55ccdd78e Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:40:22 +0000 Subject: [PATCH 4/7] The composer.json file should not raise warnings --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index a964550e..23e545fa 100644 --- 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.*", From 084bc2b1572c1541745cf27a4f82aedbdfa33535 Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:50:09 +0000 Subject: [PATCH 5/7] PHP code should not contain unreachable code - mark test incomplete instead of just return --- test/ConvertTest.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/ConvertTest.php b/test/ConvertTest.php index 76341ec1..5f43cb06 100644 --- 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; From 221fd0310b4e5105324f1e34973dbc7ac6fb7708 Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:50:58 +0000 Subject: [PATCH 6/7] Unused use statement should be avoided --- test/Bug3017880Test.php | 1 - test/NumberTest.php | 1 - 2 files changed, 2 deletions(-) diff --git a/test/Bug3017880Test.php b/test/Bug3017880Test.php index ff8a4605..568dc89f 100644 --- 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; diff --git a/test/NumberTest.php b/test/NumberTest.php index 4e446687..cba272a0 100644 --- 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 From d6955e76aba1af566611a04c5d76f4838be10f1d Mon Sep 17 00:00:00 2001 From: lsolesen Date: Thu, 21 Apr 2016 12:52:38 +0000 Subject: [PATCH 7/7] Unused variable --- test/Bug3017880Test.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Bug3017880Test.php b/test/Bug3017880Test.php index 568dc89f..f893ba21 100644 --- a/test/Bug3017880Test.php +++ b/test/Bug3017880Test.php @@ -73,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');