From: Stanislav Malyshev <stas@php.net>
Date: Sun, 25 Mar 2012 20:49:19 +0000 (-0700)
Subject: fix tests
X-Git-Tag: php-5.4.1RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d51c1e0a4c86cca1dbdfb30dadd5b59db7e9eda1;p=php

fix tests
---

diff --git a/ext/intl/tests/spoofchecker_001.phpt b/ext/intl/tests/spoofchecker_001.phpt
index 0b71de61b8..7904b3a4c0 100755
--- a/ext/intl/tests/spoofchecker_001.phpt
+++ b/ext/intl/tests/spoofchecker_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 spoofchecker suspicious character checker
 --SKIPIF--
-<?php if(!extension_loaded('intl')) print 'skip'; ?>
+<?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -20,4 +20,4 @@ paypal with Cyrillic spoof characters
 bool(true)
 certain all-uppercase Latin sequences can be spoof of Greek
 bool(true)
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/ext/intl/tests/spoofchecker_002.phpt b/ext/intl/tests/spoofchecker_002.phpt
index 2cc46a7874..d570917350 100755
--- a/ext/intl/tests/spoofchecker_002.phpt
+++ b/ext/intl/tests/spoofchecker_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 spoofchecker confusable tests
 --SKIPIF--
-<?php if(!extension_loaded('intl')) print 'skip'; ?>
+<?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -17,4 +17,4 @@ var_dump($x->areConfusable("hello, world", "he11o, wor1d"));
 Checking if words are confusable
 bool(false)
 bool(true)
-bool(true)
\ No newline at end of file
+bool(true)
diff --git a/ext/intl/tests/spoofchecker_003.phpt b/ext/intl/tests/spoofchecker_003.phpt
index 11a4f3f303..0be9bfa409 100755
--- a/ext/intl/tests/spoofchecker_003.phpt
+++ b/ext/intl/tests/spoofchecker_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 spoofchecker with locale settings
 --SKIPIF--
-<?php if(!extension_loaded('intl')) print 'skip'; ?>
+<?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -22,4 +22,4 @@ var_dump($x->isSuspicious($korean));
 Is suspcious, en_US
 bool(true)
 Is suspcious, ko_KR
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/ext/intl/tests/spoofchecker_004.phpt b/ext/intl/tests/spoofchecker_004.phpt
index dc57223ab4..b38c61d717 100755
--- a/ext/intl/tests/spoofchecker_004.phpt
+++ b/ext/intl/tests/spoofchecker_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 spoofchecker with settings changed
 --SKIPIF--
-<?php if(!extension_loaded('intl')) print 'skip'; ?>
+<?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?>
 --FILE--
 <?php
 
@@ -25,4 +25,4 @@ bool(true)
 bool(true)
 Change confusable settings
 bool(false)
-bool(true)
\ No newline at end of file
+bool(true)
diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt
index 031d3cf497..045f1a090d 100644
--- a/ext/phar/tests/phpinfo_003.phpt
+++ b/ext/phar/tests/phpinfo_003.phpt
@@ -24,7 +24,7 @@ Phar
 Phar: PHP Archive support => enabled
 Phar EXT version => %s
 Phar API version => 1.1.1
-SVN revision => %cRevision: %s $
+SVN revision => %cId: %s $
 Phar-based phar archives => enabled
 Tar-based phar archives => enabled
 ZIP-based phar archives => enabled