summaryrefslogtreecommitdiff
path: root/ext/standard/tests/assert
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/tests/assert')
-rw-r--r--ext/standard/tests/assert/assert.phpt4
-rw-r--r--ext/standard/tests/assert/assert03.phpt16
-rw-r--r--ext/standard/tests/assert/assert04.phpt20
-rw-r--r--ext/standard/tests/assert/assert_basic.phpt4
-rw-r--r--ext/standard/tests/assert/assert_basic1.phpt4
-rw-r--r--ext/standard/tests/assert/assert_basic2.phpt8
-rw-r--r--ext/standard/tests/assert/assert_basic3.phpt2
-rw-r--r--ext/standard/tests/assert/assert_basic4.phpt2
-rw-r--r--ext/standard/tests/assert/assert_basic5.phpt2
-rw-r--r--ext/standard/tests/assert/assert_basic6.phpt2
-rw-r--r--ext/standard/tests/assert/assert_error.phpt2
-rw-r--r--ext/standard/tests/assert/assert_error1.phpt2
-rw-r--r--ext/standard/tests/assert/assert_error2.phpt2
-rw-r--r--ext/standard/tests/assert/assert_variation.phpt8
14 files changed, 39 insertions, 39 deletions
diff --git a/ext/standard/tests/assert/assert.phpt b/ext/standard/tests/assert/assert.phpt
index 44fb6091db..08e1188d60 100644
--- a/ext/standard/tests/assert/assert.phpt
+++ b/ext/standard/tests/assert/assert.phpt
@@ -4,13 +4,13 @@ assert()
error_reporting = 2039
assert.active = 0
assert.warning = 1
-assert.callback =
+assert.callback =
assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
function a($file,$line,$myev)
-{
+{
echo "assertion failed $line,\"$myev\"\n";
}
diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt
index d839414cab..95756f191e 100644
--- a/ext/standard/tests/assert/assert03.phpt
+++ b/ext/standard/tests/assert/assert03.phpt
@@ -3,30 +3,30 @@ assert() - set callback using ini_set()
--INI--
assert.active = 1
assert.warning = 0
-assert.callback =
+assert.callback =
assert.bail = 0
assert.quiet_eval = 1
--FILE--
<?php
function a($file,$line,$myev)
-{
+{
echo "assertion failed - a - $line,\"$myev\"\n";
}
-
+
function b($file,$line,$myev)
-{
+{
echo "assertion failed - b - $line,\"$myev\"\n";
}
-
+
assert_options(ASSERT_ACTIVE,1);
assert_options(ASSERT_QUIET_EVAL,1);
assert_options(ASSERT_WARNING,0);
-
+
$a = 0;
-
+
assert_options(ASSERT_CALLBACK,"a");
assert('$a != 0');
-
+
/* Modify call back using ini_set() */
ini_set("assert.callback", "b");
assert('$a != 0');
diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 53f8d92167..da4acc394b 100644
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -3,7 +3,7 @@ misc assert() tests tests
--INI--
assert.active = 1
assert.warning = 1
-assert.callback =
+assert.callback =
assert.bail = 0
assert.quiet_eval = 0
--FILE--
@@ -11,29 +11,29 @@ assert.quiet_eval = 0
/* Assert not active */
assert_options(ASSERT_ACTIVE, 0);
assert(1);
-
-
+
+
/* Wrong parameter count in assert */
assert_options(ASSERT_ACTIVE, 1);
assert(2, "failure", 3);
-
+
/* Wrong parameter count in assert_options */
assert_options(ASSERT_ACTIVE, 0, 2);
-
+
/* Wrong parameter name in assert_options */
$test="ASSERT_FRED";
assert_options($test, 1);
-
+
/* Assert false */
assert(0);
-
-
+
+
/* Assert false and bail*/
assert_options(ASSERT_BAIL, 1);
assert(0);
-
+
echo "not reached\n";
-
+
?>
--EXPECTF--
Warning: assert() expects at most 2 parameters, 3 given in %s on line %d
diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt
index 48b5fb6c6a..16aef6b814 100644
--- a/ext/standard/tests/assert/assert_basic.phpt
+++ b/ext/standard/tests/assert/assert_basic.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
@@ -18,7 +18,7 @@ var_dump($r2=assert($sa));
$sa = "0 == 0";
var_dump($r2=assert($sa));
-//Non string assert
+//Non string assert
var_dump($r2=assert(0));
var_dump($r2=assert(1));
--EXPECTF--
diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt
index 8aed519246..1280638416 100644
--- a/ext/standard/tests/assert/assert_basic1.phpt
+++ b/ext/standard/tests/assert/assert_basic1.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
@@ -19,7 +19,7 @@ var_dump($r2=assert($sa));
$sa = "0 == 0";
var_dump($r2=assert($sa));
-//Non string assert
+//Non string assert
var_dump($r2=assert(0));
var_dump($r2=assert(1));
--EXPECTF--
diff --git a/ext/standard/tests/assert/assert_basic2.phpt b/ext/standard/tests/assert/assert_basic2.phpt
index 42c59b1b9a..d6c150d0d0 100644
--- a/ext/standard/tests/assert/assert_basic2.phpt
+++ b/ext/standard/tests/assert/assert_basic2.phpt
@@ -8,19 +8,19 @@ assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
-function f2()
+function f2()
{
echo "f2 called\n";
}
-function f1()
+function f1()
{
echo "f1 called\n";
}
-
+
var_dump($o = assert_options(ASSERT_CALLBACK));
assert(0);
-
+
var_dump($o= assert_options(ASSERT_CALLBACK, "f2"));
var_dump($n= assert_options(ASSERT_CALLBACK));
assert(0);
diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt
index 9fcbbd5c3c..e5e6754be7 100644
--- a/ext/standard/tests/assert/assert_basic3.phpt
+++ b/ext/standard/tests/assert/assert_basic3.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 1
assert.bail = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt
index 2f11234594..40b4e94de1 100644
--- a/ext/standard/tests/assert/assert_basic4.phpt
+++ b/ext/standard/tests/assert/assert_basic4.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 0
assert.callback = f1
--FILE--
<?php
-// Check the initial settings for all assert_options
+// Check the initial settings for all assert_options
//Using assert_options;
echo "Initial values: assert_options(ASSERT_ACTIVE) => [".assert_options(ASSERT_ACTIVE)."]\n";
diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt
index 745f3e7e29..79a3ff13b8 100644
--- a/ext/standard/tests/assert/assert_basic5.phpt
+++ b/ext/standard/tests/assert/assert_basic5.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
diff --git a/ext/standard/tests/assert/assert_basic6.phpt b/ext/standard/tests/assert/assert_basic6.phpt
index 2a73713437..8abe653019 100644
--- a/ext/standard/tests/assert/assert_basic6.phpt
+++ b/ext/standard/tests/assert/assert_basic6.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 1
assert.bail = 0
--FILE--
<?php
-function f1($message)
+function f1($message)
{
echo "f1 called\n";
}
diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt
index 28655be318..6987b1c6b5 100644
--- a/ext/standard/tests/assert/assert_error.phpt
+++ b/ext/standard/tests/assert/assert_error.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt
index 408ede0ae4..8bcc23167e 100644
--- a/ext/standard/tests/assert/assert_error1.phpt
+++ b/ext/standard/tests/assert/assert_error1.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 1
assert.bail = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
diff --git a/ext/standard/tests/assert/assert_error2.phpt b/ext/standard/tests/assert/assert_error2.phpt
index f9018db05b..8770391527 100644
--- a/ext/standard/tests/assert/assert_error2.phpt
+++ b/ext/standard/tests/assert/assert_error2.phpt
@@ -10,7 +10,7 @@ error_reporting = -1
display_errors = 1
--FILE--
<?php
-function f1($script, $line, $message, $user_message)
+function f1($script, $line, $message, $user_message)
{
echo "f1 called\n";
}
diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index 8ae84344c6..10ec5b95f6 100644
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -1,5 +1,5 @@
--TEST--
-assert() - variation - test callback options using ini_get/ini_set/assert_options
+assert() - variation - test callback options using ini_get/ini_set/assert_options
--INI--
assert.active = 1
assert.warning = 0
@@ -8,15 +8,15 @@ assert.bail = 0
assert.quiet_eval = 0
--FILE--
<?php
-function f1()
+function f1()
{
echo "f1 called\n";
}
-function f2()
+function f2()
{
echo "f2 called\n";
}
-function f3()
+function f3()
{
echo "f3 called\n";
}