summaryrefslogtreecommitdiff
path: root/ext/exif
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-14 17:23:43 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-14 19:44:14 +0200
commit17ccbeec3242b80f84fbf6b3acd58421ef003b02 (patch)
tree8fed8d7515c6603fd4a50eb0f8177883bc6da336 /ext/exif
parentcc7215f48f66982f0b7799c47d8fa4c09a32a3c7 (diff)
downloadphp-git-17ccbeec3242b80f84fbf6b3acd58421ef003b02.tar.gz
Trim trailing whitespace in *.phpt
Diffstat (limited to 'ext/exif')
-rw-r--r--ext/exif/tests/bug34704-mb.phpt2
-rw-r--r--ext/exif/tests/bug34704.phpt2
-rw-r--r--ext/exif/tests/bug48378.phpt2
-rw-r--r--ext/exif/tests/bug50660/bug50660.phpt2
-rw-r--r--ext/exif/tests/bug60150.phpt2
-rw-r--r--ext/exif/tests/bug72735/bug72682.phpt2
-rw-r--r--ext/exif/tests/bug72735/bug72735.phpt2
-rw-r--r--ext/exif/tests/bug72819/bug72819.phpt2
-rw-r--r--ext/exif/tests/bug73115/bug73115.phpt2
-rw-r--r--ext/exif/tests/bug74428/bug74428.phpt2
-rw-r--r--ext/exif/tests/exif002.phpt2
-rw-r--r--ext/exif/tests/exif003.phpt2
-rw-r--r--ext/exif/tests/exif004.phpt4
-rw-r--r--ext/exif/tests/exif_imagetype_error.phpt2
-rw-r--r--ext/exif/tests/exif_imagetype_variation1.phpt6
-rw-r--r--ext/exif/tests/exif_tagname_basic.phpt2
-rw-r--r--ext/exif/tests/exif_tagname_error.phpt2
-rw-r--r--ext/exif/tests/exif_tagname_variation1-64bit.phpt6
-rw-r--r--ext/exif/tests/exif_tagname_variation1.phpt6
-rw-r--r--ext/exif/tests/sony.phpt2
20 files changed, 27 insertions, 27 deletions
diff --git a/ext/exif/tests/bug34704-mb.phpt b/ext/exif/tests/bug34704-mb.phpt
index 05c50b3a5a..8185eb319c 100644
--- a/ext/exif/tests/bug34704-mb.phpt
+++ b/ext/exif/tests/bug34704-mb.phpt
@@ -4,7 +4,7 @@ Bug #34704 (Infinite recursion due to corrupt JPEG)
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug34704私はガラスを食べられます.jpg';
diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt
index 7688ce861a..ebe05fb878 100644
--- a/ext/exif/tests/bug34704.phpt
+++ b/ext/exif/tests/bug34704.phpt
@@ -4,7 +4,7 @@ Bug #34704 (Infinite recursion due to corrupt JPEG)
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug34704.jpg';
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
index 286ce61073..a66aba3a51 100644
--- a/ext/exif/tests/bug48378.phpt
+++ b/ext/exif/tests/bug48378.phpt
@@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG)
--FILE--
<?php
exif_read_data(
-dirname(__FILE__) . "/bug48378.jpeg",
+dirname(__FILE__) . "/bug48378.jpeg",
"FILE,COMPUTED,ANY_TAG"
);
?>
diff --git a/ext/exif/tests/bug50660/bug50660.phpt b/ext/exif/tests/bug50660/bug50660.phpt
index 00a83ce4b0..e523921ebd 100644
--- a/ext/exif/tests/bug50660/bug50660.phpt
+++ b/ext/exif/tests/bug50660/bug50660.phpt
@@ -4,7 +4,7 @@ Bug #50660 (exif_read_data(): Illegal IFD offset (works fine with other exif rea
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug50660-1.jpg';
diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt
index be01998fd8..2f39c11511 100644
--- a/ext/exif/tests/bug60150.phpt
+++ b/ext/exif/tests/bug60150.phpt
@@ -4,7 +4,7 @@ Bug #60150 (Integer overflow during the parsing of invalid exif header)
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug60150.jpg';
diff --git a/ext/exif/tests/bug72735/bug72682.phpt b/ext/exif/tests/bug72735/bug72682.phpt
index b3f17791a3..afbf5c59cb 100644
--- a/ext/exif/tests/bug72735/bug72682.phpt
+++ b/ext/exif/tests/bug72735/bug72682.phpt
@@ -9,7 +9,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) {
$info = exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . $picture);
var_dump($info['MakerNote']);
-}
+}
?>
--EXPECTF--
nokia.jpg: string(5) "Nikon"
diff --git a/ext/exif/tests/bug72735/bug72735.phpt b/ext/exif/tests/bug72735/bug72735.phpt
index 38d9ed2199..055ec0d06b 100644
--- a/ext/exif/tests/bug72735/bug72735.phpt
+++ b/ext/exif/tests/bug72735/bug72735.phpt
@@ -16,7 +16,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) {
}
echo 'int(' . $len . ')', PHP_EOL;
-}
+}
?>
--EXPECTF--
nokia.jpg: int(5899)
diff --git a/ext/exif/tests/bug72819/bug72819.phpt b/ext/exif/tests/bug72819/bug72819.phpt
index f71fa31663..d99a15c197 100644
--- a/ext/exif/tests/bug72819/bug72819.phpt
+++ b/ext/exif/tests/bug72819/bug72819.phpt
@@ -4,7 +4,7 @@ Bug #72819 (EXIF thumbnails not read anymore)
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug72819.jpg';
diff --git a/ext/exif/tests/bug73115/bug73115.phpt b/ext/exif/tests/bug73115/bug73115.phpt
index 969ddebe9f..9ce3818e59 100644
--- a/ext/exif/tests/bug73115/bug73115.phpt
+++ b/ext/exif/tests/bug73115/bug73115.phpt
@@ -4,7 +4,7 @@ Bug #73115 (exif_read_data triggers warning on reading binary strings)
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug73115.jpg';
diff --git a/ext/exif/tests/bug74428/bug74428.phpt b/ext/exif/tests/bug74428/bug74428.phpt
index b2beca3f21..24911084e4 100644
--- a/ext/exif/tests/bug74428/bug74428.phpt
+++ b/ext/exif/tests/bug74428/bug74428.phpt
@@ -4,7 +4,7 @@ Bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with correct exi
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
$infile = dirname(__FILE__).'/bug74428.jpg';
diff --git a/ext/exif/tests/exif002.phpt b/ext/exif/tests/exif002.phpt
index 2a70f2920c..7f78ef2813 100644
--- a/ext/exif/tests/exif002.phpt
+++ b/ext/exif/tests/exif002.phpt
@@ -4,7 +4,7 @@ Check for exif_thumbnail
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
output_handler=
-zlib.output_compression=0
+zlib.output_compression=0
--FILE--
<?php
/*
diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index 20cb61ee17..d0a1b7b3ba 100644
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -1,7 +1,7 @@
--TEST--
Check for exif_read_data, Unicode user comment
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('exif')) die('skip exif extension not available');
if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 8797955f8c..fd941cc4d4 100644
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -1,7 +1,7 @@
--TEST--
-Check for exif_read_data, Unicode WinXP tags
+Check for exif_read_data, Unicode WinXP tags
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('exif')) die('skip exif extension not available');
if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt
index 989d02b6a4..59c9b8d12c 100644
--- a/ext/exif/tests/exif_imagetype_error.phpt
+++ b/ext/exif/tests/exif_imagetype_error.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test exif_imagetype() function : error conditions
+Test exif_imagetype() function : error conditions
--SKIPIF--
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
diff --git a/ext/exif/tests/exif_imagetype_variation1.phpt b/ext/exif/tests/exif_imagetype_variation1.phpt
index d33217c5f8..c190aed15c 100644
--- a/ext/exif/tests/exif_imagetype_variation1.phpt
+++ b/ext/exif/tests/exif_imagetype_variation1.phpt
@@ -21,7 +21,7 @@ unset($unset_var);
class sample {
public function __toString() {
return "obj'ct";
- }
+ }
}
// Defining resource
@@ -65,13 +65,13 @@ $values = array (
// unset variable
$unset_var,
-
+
// objects
new sample(),
// resource
$file_handle,
-
+
NULL,
null
);
diff --git a/ext/exif/tests/exif_tagname_basic.phpt b/ext/exif/tests/exif_tagname_basic.phpt
index e33601197b..82bd06ebab 100644
--- a/ext/exif/tests/exif_tagname_basic.phpt
+++ b/ext/exif/tests/exif_tagname_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test exif_tagname() function : basic functionality
+Test exif_tagname() function : basic functionality
--SKIPIF--
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--INI--
diff --git a/ext/exif/tests/exif_tagname_error.phpt b/ext/exif/tests/exif_tagname_error.phpt
index ed1f2fdc3a..2408ad5ce8 100644
--- a/ext/exif/tests/exif_tagname_error.phpt
+++ b/ext/exif/tests/exif_tagname_error.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test exif_tagname() function : error conditions
+Test exif_tagname() function : error conditions
--SKIPIF--
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
index 22298af2ae..468a63bf0a 100644
--- a/ext/exif/tests/exif_tagname_variation1-64bit.phpt
+++ b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
@@ -23,7 +23,7 @@ unset($unset_var);
class sample {
public function __toString() {
return "obj'ct";
- }
+ }
}
// Defining resource
@@ -67,13 +67,13 @@ $values = array (
// unset variable
$unset_var,
-
+
// objects
new sample(),
// resource
$file_handle,
-
+
NULL,
null
);
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index 44d2568f49..805ad814b2 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -23,7 +23,7 @@ unset($unset_var);
class sample {
public function __toString() {
return "obj'ct";
- }
+ }
}
// Defining resource
@@ -65,13 +65,13 @@ $values = array (
// unset variable
$unset_var,
-
+
// objects
new sample(),
// resource
$file_handle,
-
+
NULL,
null
);
diff --git a/ext/exif/tests/sony.phpt b/ext/exif/tests/sony.phpt
index 683d58d4ac..8c2bf7c58c 100644
--- a/ext/exif/tests/sony.phpt
+++ b/ext/exif/tests/sony.phpt
@@ -10,7 +10,7 @@ if (!$data) {
exit('Error: Unable to parse EXIF data');
}
-// Perhaps we should just test for SonyModelID since it seems to be
+// Perhaps we should just test for SonyModelID since it seems to be
// the most specific tag name that should be found in any Sony generated
// picture
foreach (['SonyModelID', 'Panorama', 'AntiBlur'] as $sony_tag) {