Fix dos style eol in phpts

diff --git a/ext/opcache/tests/issue0115.phpt b/ext/opcache/tests/issue0115.phpt
index a1e469ff2fec247976ae00b853039db071cdfd7f..0dfdd9f0eb4a6aa5ef4939b42b86fba34bbf2e6a 100644 (file)
--- a/ext/opcache/tests/issue0115.phpt
+++ b/ext/opcache/tests/issue0115.phpt
@@ -1,48 +1,48 @@
---TEST--\r
-ISSUE #115 (path issue when using phar)\r
---INI--\r
-opcache.enable=1\r
-opcache.enable_cli=1\r
-phar.readonly=0\r
---SKIPIF--\r
-<?php require_once('skipif.inc'); ?>\r
-<?php if (!extension_loaded("phar")) die("skip"); ?>\r
-<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>\r
---FILE--\r
-<?php\r
-$stub = '<?php\r
-Phar::interceptFileFuncs();\r
-require "phar://this/index.php";\r
-__HALT_COMPILER(); ?>';\r
-$p = new Phar(__DIR__ . '/issue0115_1.phar.php', 0, 'this');\r
-$p['index.php'] = '<?php\r
-echo "Hello from Index 1.\n";\r
-require_once "phar://this/hello.php"; \r
-';\r
-$p['hello.php'] = "Hello World 1!\n";    \r
-$p->setStub($stub);\r
-unset($p);\r
-$p = new Phar(__DIR__ . '/issue0115_2.phar.php', 0, 'this');\r
-$p['index.php'] = '<?php\r
-echo "Hello from Index 2.\n";\r
-require_once "phar://this/hello.php"; \r
-';\r
-$p['hello.php'] = "Hello World 2!\n";    \r
-$p->setStub($stub);\r
-unset($p);\r
-\r
-include "php_cli_server.inc";\r
-php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1');\r
-echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_1.phar.php');\r
-echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_2.phar.php');\r
-?>\r
---CLEAN--\r
-<?php \r
-@unlink(__DIR__ . '/issue0115_1.phar.php');\r
-@unlink(__DIR__ . '/issue0115_2.phar.php');\r
-?>\r
---EXPECT--\r
-Hello from Index 1.\r
-Hello World 1!\r
-Hello from Index 2.\r
-Hello World 2!\r
+--TEST--
+ISSUE #115 (path issue when using phar)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+phar.readonly=0
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
+--FILE--
+<?php
+$stub = '<?php
+Phar::interceptFileFuncs();
+require "phar://this/index.php";
+__HALT_COMPILER(); ?>';
+$p = new Phar(__DIR__ . '/issue0115_1.phar.php', 0, 'this');
+$p['index.php'] = '<?php
+echo "Hello from Index 1.\n";
+require_once "phar://this/hello.php"; 
+';
+$p['hello.php'] = "Hello World 1!\n";    
+$p->setStub($stub);
+unset($p);
+$p = new Phar(__DIR__ . '/issue0115_2.phar.php', 0, 'this');
+$p['index.php'] = '<?php
+echo "Hello from Index 2.\n";
+require_once "phar://this/hello.php"; 
+';
+$p['hello.php'] = "Hello World 2!\n";    
+$p->setStub($stub);
+unset($p);
+
+include "php_cli_server.inc";
+php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1');
+echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_1.phar.php');
+echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0115_2.phar.php');
+?>
+--CLEAN--
+<?php 
+@unlink(__DIR__ . '/issue0115_1.phar.php');
+@unlink(__DIR__ . '/issue0115_2.phar.php');
+?>
+--EXPECT--
+Hello from Index 1.
+Hello World 1!
+Hello from Index 2.
+Hello World 2!

diff --git a/ext/opcache/tests/issue0140.phpt b/ext/opcache/tests/issue0140.phpt
index 7c0d6b92b311f3ce112ca10e202e665a01606a9e..98e0e45cc25dd2cd87ebc223c8ce6892653c7009 100644 (file)
--- a/ext/opcache/tests/issue0140.phpt
+++ b/ext/opcache/tests/issue0140.phpt
@@ -1,43 +1,43 @@
---TEST--\r
-Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"\r
---INI--\r
-opcache.enable=1\r
-opcache.enable_cli=1\r
-opcache.revalidate_freq=0\r
-opcache.file_update_protection=0\r
---SKIPIF--\r
-<?php require_once('skipif.inc'); ?>\r
-<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>\r
---FILE--\r
-<?php\r
-define("FILENAME", dirname(__FILE__) . "/issuer0140.inc.php");\r
-file_put_contents(FILENAME, "1\n");\r
-\r
-var_dump(is_readable(FILENAME));\r
-include(FILENAME);\r
-var_dump(filemtime(FILENAME));\r
-\r
-sleep(2);\r
-file_put_contents(FILENAME, "2\n");\r
-\r
-var_dump(is_readable(FILENAME));\r
-include(FILENAME);\r
-var_dump(filemtime(FILENAME));\r
-\r
-sleep(2);\r
-unlink(FILENAME);\r
-\r
-var_dump(is_readable(FILENAME));\r
-var_dump(@include(FILENAME));\r
-var_dump(@filemtime(FILENAME));\r
-?>\r
---EXPECTF--\r
-bool(true)\r
-1\r
-int(%d)\r
-bool(true)\r
-2\r
-int(%d)\r
-bool(false)\r
-bool(false)\r
-bool(false)\r
+--TEST--
+Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.revalidate_freq=0
+opcache.file_update_protection=0
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
+--FILE--
+<?php
+define("FILENAME", dirname(__FILE__) . "/issuer0140.inc.php");
+file_put_contents(FILENAME, "1\n");
+
+var_dump(is_readable(FILENAME));
+include(FILENAME);
+var_dump(filemtime(FILENAME));
+
+sleep(2);
+file_put_contents(FILENAME, "2\n");
+
+var_dump(is_readable(FILENAME));
+include(FILENAME);
+var_dump(filemtime(FILENAME));
+
+sleep(2);
+unlink(FILENAME);
+
+var_dump(is_readable(FILENAME));
+var_dump(@include(FILENAME));
+var_dump(@filemtime(FILENAME));
+?>
+--EXPECTF--
+bool(true)
+1
+int(%d)
+bool(true)
+2
+int(%d)
+bool(false)
+bool(false)
+bool(false)

diff --git a/ext/opcache/tests/issue0149.phpt b/ext/opcache/tests/issue0149.phpt
index 7044d3938837a87f1a62b98d5f2b3c6a671ff2bd..8c7f1bb7e08399183978e333746d266862060870 100644 (file)
--- a/ext/opcache/tests/issue0149.phpt
+++ b/ext/opcache/tests/issue0149.phpt
@@ -1,35 +1,35 @@
---TEST--\r
-ISSUE #149 (Phar mount points not working this OPcache enabled)\r
---INI--\r
-opcache.enable=1\r
-opcache.enable_cli=1\r
-phar.readonly=0\r
---SKIPIF--\r
-<?php require_once('skipif.inc'); ?>\r
-<?php if (!extension_loaded("phar")) die("skip"); ?>\r
-<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>\r
---FILE--\r
-<?php\r
-$stub = "<?php header('Content-Type: text/plain;');\r
-Phar::mount('this.file', '". __FILE__ . "');\r
-echo 'OK\n';\r
-__HALT_COMPILER(); ?>";\r
-$p = new Phar(__DIR__ . '/issue0149.phar.php', 0, 'this');\r
-$p['index.php'] = "";  # A Phar must have at least one file, hence this dummy\r
-$p->setStub($stub);\r
-unset($p);\r
-\r
-include "php_cli_server.inc";\r
-php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1');\r
-echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php');\r
-echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php');\r
-echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php');\r
-?>\r
---CLEAN--\r
-<?php \r
-@unlink(__DIR__ . '/issue0149.phar.php');\r
-?>\r
---EXPECT--\r
-OK\r
-OK\r
-OK\r
+--TEST--
+ISSUE #149 (Phar mount points not working this OPcache enabled)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+phar.readonly=0
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
+--FILE--
+<?php
+$stub = "<?php header('Content-Type: text/plain;');
+Phar::mount('this.file', '". __FILE__ . "');
+echo 'OK\n';
+__HALT_COMPILER(); ?>";
+$p = new Phar(__DIR__ . '/issue0149.phar.php', 0, 'this');
+$p['index.php'] = "";  # A Phar must have at least one file, hence this dummy
+$p->setStub($stub);
+unset($p);
+
+include "php_cli_server.inc";
+php_cli_server_start('-d opcache.enable=1 -d opcache.enable_cli=1');
+echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php');
+echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php');
+echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/issue0149.phar.php');
+?>
+--CLEAN--
+<?php 
+@unlink(__DIR__ . '/issue0149.phar.php');
+?>
+--EXPECT--
+OK
+OK
+OK