[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Apr 27 01:32:45 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3385r2=1.3386diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3385 php-src/ChangeLog:1.3386 --- php-src/ChangeLog:1.3385Sun Apr 26 01:32:37 2009 +++ php-src/ChangeLog Mon Apr 27 01:32:44 2009 @@ -1,3 +1,59 @@ +2009-04-26 Sebastian Schürmann sschuermann...@yahoo.de + +* (PHP_5_3) + ext/spl/tests/spl_classes.phpt: + - fix tests + - output of spl_classes differs from 5_2 to 5_3, changed to is_array + +* (PHP_5_2) + ext/spl/tests/spl_classes.phpt + ext/standard/tests/general_functions/call_user_method.phpt + ext/standard/tests/versioning/php_sapi_name_variation001.phpt: + - fixes to tests + - spl_classes only checks for is_array(), the output in 5_3_0 and 5_2_0 + is very different, + test will run this way in 5.2 and 5.3 w.o. problems + - call user method recognizes the different errormessage in 5_2_0 now + - the php_sap_name_variation001 check now goes for cgi instead of the + cgi-fcgi output string + +2009-04-26 Pierre-Alain Joye pierre@gmail.com + +* ext/imap/php_imap.c: + - rmeove duplicate definition + +2009-04-26 Ilia Alshanetsky i...@prohost.org + +* ext/standard/strnatcmp.c: + + Fixed compiler warning + +2009-04-26 Pierre-Alain Joye pierre@gmail.com + +* ext/imap/php_imap.c + ext/imap/php_imap.c: + - correct clause + +2009-04-26 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_2) + ext/session/php_session.h + ext/session/session.c + ext/session/tests/008-php4.2.3.phpt + ext/session/tests/014.phpt + ext/session/tests/session_decode_variation3.phpt + ext/session/tests/session_encode_error2.phpt + ext/session/tests/session_encode_variation1.phpt + ext/session/tests/session_encode_variation2.phpt + ext/session/tests/session_encode_variation6.phpt + ext/session/tests/session_encode_variation8.phpt: + MF53: Sync the session.c file structure and some bug fixes forgotten to + merge. + +* (PHP_5_2) + ext/standard/tests/array/array_count_values_variation.phpt: + - Fix test cleanup + 2009-04-25 Arnaud Le Blanc arnaud...@gmail.com * ext/spl/php_spl.c: @@ -37497,7 +37553,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3385 2009/04/26 01:32:37 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3386 2009/04/27 01:32:44 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: phpruntests /tests/testcase/sections/executablesections rtFileSectionTest.php rtSkipIfSectionTest.php
zoe Sun Apr 26 07:12:58 2009 UTC
Modified files:
/phpruntests/tests/testcase/sections/executablesections
rtSkipIfSectionTest.php
rtFileSectionTest.php
Log:
tidy
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php?r1=1.2r2=1.3diff_format=u
Index:
phpruntests/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php
diff -u
phpruntests/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php:1.2
phpruntests/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php:1.3
---
phpruntests/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php:1.2
Fri Apr 24 09:42:02 2009
+++
phpruntests/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php
Sun Apr 26 07:12:58 2009
@@ -3,12 +3,12 @@
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../../../src/rtAutoload.php';
-class rtFileSectionTest extends PHPUnit_Framework_TestCase
+class rtSkipifSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreateInstance()
{
-$fileSection = new rtFileSection('FILE', array('?php', 'echo hello
world;', '?'));
-$code = $fileSection-getContents();
+$skipifSection = new rtSkipIfSection('SKIPIF', array('?php', 'echo
hello world;', '?'));
+$code = $skipifSection-getContents();
$this-assertEquals('?php', $code[0]);
}
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/executablesections/rtFileSectionTest.php?r1=1.2r2=1.3diff_format=u
Index:
phpruntests/tests/testcase/sections/executablesections/rtFileSectionTest.php
diff -u
phpruntests/tests/testcase/sections/executablesections/rtFileSectionTest.php:1.2
phpruntests/tests/testcase/sections/executablesections/rtFileSectionTest.php:1.3
---
phpruntests/tests/testcase/sections/executablesections/rtFileSectionTest.php:1.2
Fri Apr 24 09:42:02 2009
+++
phpruntests/tests/testcase/sections/executablesections/rtFileSectionTest.php
Sun Apr 26 07:12:58 2009
@@ -3,12 +3,12 @@
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../../../src/rtAutoload.php';
-class rtSkipIfSectionTest extends PHPUnit_Framework_TestCase
+class rtFileSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreateInstance()
{
-$skipifSection = new rtSkipIfSection('SKIPIF', array('?php', 'echo
hello world;', '?'));
-$code = $skipifSection-getContents();
+$fileSection = new rtFileSection('FILE', array('?php', 'echo hello
world;', '?'));
+$code = $fileSection-getContents();
$this-assertEquals('?php', $code[0]);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/executablesections rtFileSection.php
zoe Sun Apr 26 07:13:36 2009 UTC
Modified files:
/phpruntests/src/testcase/sections/executablesections
rtFileSection.php
Log:
Add a check to skip a CGI test if the executable has not been set
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtFileSection.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtFileSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.2
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.3
--- phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.2
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/executablesections/rtFileSection.php
Sun Apr 26 07:13:36 2009
@@ -16,22 +16,29 @@
$this-setExecutableFileName($testCase-getName());
$this-writeExecutableFile();
-$phpCommand = $runConfiguration-getSetting('PhpExecutable');
-$phpCommand .= '
'.$testCase-testConfiguration-getPhpCommandLineArguments();
-$phpCommand .= ' -f '.$this-fileName;
-$phpCommand .= '
'.$testCase-testConfiguration-getTestCommandLineArguments();
+$phpExecutable = $testCase-testConfiguration-getPhpExecutable();
-$PhpRunner = new rtPhpRunner($phpCommand,
-$testCase-testConfiguration-getEnvironmentVariables(),
+// The CGI excutable is null if it is not available, check and SKIP if
appropriate
+if ($phpExecutable != null) {
+$phpCommand = $phpExecutable;
+$phpCommand .= '
'.$testCase-testConfiguration-getPhpCommandLineArguments();
+$phpCommand .= ' -f '.$this-fileName;
+$phpCommand .= '
'.$testCase-testConfiguration-getTestCommandLineArguments();
+
+$PhpRunner = new rtPhpRunner($phpCommand,
+$testCase-testConfiguration-getEnvironmentVariables(),
$runConfiguration-getSetting('WorkingDirectory')
-);
-
-try {
-$this-output = $PhpRunner-runphp();
-} catch (rtPhpRunnerException $e) {
-$this-status['fail'] = $e-getMessage();
+);
+
+try {
+$this-output = $PhpRunner-runphp();
+} catch (rtPhpRunnerException $e) {
+$this-status['fail'] = $e-getMessage();
+}
+} else {
+$this-status['skip'] = 'The CGI executable is unavailable';
}
-
+
return $this-status;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/executablesections rtCleanSection.php rtFileSection.php rtSkipIfSection.php
zoe Sun Apr 26 07:17:14 2009 UTC
Modified files:
/phpruntests/src/testcase/sections/executablesections
rtCleanSection.php
rtSkipIfSection.php
rtFileSection.php
Log:
Doc blocks
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtCleanSection.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtCleanSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.2
phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.3
--- phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.2
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/executablesections/rtCleanSection.php
Sun Apr 26 07:17:14 2009
@@ -1,6 +1,27 @@
?php
/**
- * Class representing the clean test section
+ * rtCleanSection
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
+ */
+
+/**
+ * Executes the code in the --CLEAN-- section
+ *
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
*/
class rtCleanSection extends rtExecutableSection
{
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.2
phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.3
---
phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.2
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php
Sun Apr 26 07:17:14 2009
@@ -1,6 +1,27 @@
?php
/**
- * Class representing the SkipIf test section
+ * rtSkipIfSection
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
+ */
+
+/**
+ * Executes the code in the --SKIPIF-- section
+ *
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
*/
class rtSkipIfSection extends rtExecutableSection
{
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtFileSection.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtFileSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.3
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.4
--- phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.3
Sun Apr 26 07:13:36 2009
+++ phpruntests/src/testcase/sections/executablesections/rtFileSection.php
Sun Apr 26 07:17:14 2009
@@ -1,6 +1,27 @@
?php
/**
- * Class for the --FILE-- section
+ * rtFileSection
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
+ */
+
+/**
+ * Executes the code in the --FILE-- section
+ *
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
*/
class rtFileSection extends rtExecutableSection
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
HI Pierre, This looks wrong. On Sat, Apr 25, 2009 at 4:12 PM, Pierre-Alain Joye paj...@php.net wrote: pajoye Sat Apr 25 15:12:45 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/imap php_imap.c Log: - #elif @@ -1079,9 +1079,9 @@ #if HAVE_IMAP2007e #define CCLIENTVERSION 2007e -#if HAVE_IMAP2007e +#elif HAVE_IMAP2007e #define CCLIENTVERSION 2007d Paul -- Paul Biggar paul.big...@gmail.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtGetSection.php
zoe Sun Apr 26 07:37:51 2009 UTC
Added files:
/phpruntests/src/testcase/sections/configurationsections
rtGetSection.php
Log:
Added Get setion
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtGetSection.php?view=markuprev=1.1
Index: phpruntests/src/testcase/sections/configurationsections/rtGetSection.php
+++ phpruntests/src/testcase/sections/configurationsections/rtGetSection.php
?php
/**
* rtGetSection
*
* @category Testing
* @package RUNTESTS
* @authorZoe Slattery z...@php.net
* @authorStefan Priebsch sprieb...@php.net
* @copyright 2009 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @link http://qa.php.net/
*/
/**
* Sets environment variables for GET section
*
*
* @category Testing
* @package RUNTESTS
* @authorZoe Slattery z...@php.net
* @authorStefan Priebsch sprieb...@php.net
* @copyright 2009 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @link http://qa.php.net/
*/
class rtGetSection extends rtConfigurationSection
{
private $getVariables = array();
protected function init()
{
$this-getVariables['QUERY_STRING'] = $this-sectionContents[0];
}
/**
* Additional GET environment variables required by the test
*
* @return array
*/
public function getGetVariables()
{
return $this-getVariables;
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtClassMap.php
zoe Sun Apr 26 07:38:11 2009 UTC Modified files: /phpruntests/srcrtClassMap.php Log: Added Get setion http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.1.1.1r2=1.2diff_format=u Index: phpruntests/src/rtClassMap.php diff -u phpruntests/src/rtClassMap.php:1.1.1.1 phpruntests/src/rtClassMap.php:1.2 --- phpruntests/src/rtClassMap.php:1.1.1.1 Wed Apr 15 16:30:18 2009 +++ phpruntests/src/rtClassMap.php Sun Apr 26 07:38:11 2009 @@ -57,6 +57,7 @@ 'rtTestResults'= 'testcase/rtTestResults.php', 'rtArgsSection'= 'testcase/sections/configurationsections/rtArgsSection.php', 'rtEnvSection' = 'testcase/sections/configurationsections/rtEnvSection.php', +'rtGetSection' = 'testcase/sections/configurationsections/rtGetSection.php', 'rtIniSection' = 'testcase/sections/configurationsections/rtIniSection.php', 'rtCleanSection' = 'testcase/sections/executablesections/rtCleanSection.php', 'rtFileSection'= 'testcase/sections/executablesections/rtFileSection.php', -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase/sections/configurationsections rtGetSectionTest.php
zoe Sun Apr 26 07:38:32 2009 UTC
Added files:
/phpruntests/tests/testcase/sections/configurationsections
rtGetSectionTest.php
Log:
Added Get setion test
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/configurationsections/rtGetSectionTest.php?view=markuprev=1.1
Index:
phpruntests/tests/testcase/sections/configurationsections/rtGetSectionTest.php
+++
phpruntests/tests/testcase/sections/configurationsections/rtGetSectionTest.php
?php
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../../../src/rtAutoload.php';
class rtGetSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreateInstance()
{
$getSection = new rtGetSection('GET',
array('hello=Worldgoodbye=MrChips'));
$envlist = $getSection-getGetVariables();
$this-assertEquals('hello=Worldgoodbye=MrChips',
$envlist['QUERY_STRING']);
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Sun Apr 26 07:40:57 2009 UTC
Modified files:
/phpruntests/src/testcase rtTestConfiguration.php
Log:
Add code to get Get env variables
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.4
phpruntests/src/testcase/rtTestConfiguration.php:1.5
--- phpruntests/src/testcase/rtTestConfiguration.php:1.4Sat Apr 25
17:27:48 2009
+++ phpruntests/src/testcase/rtTestConfiguration.phpSun Apr 26 07:40:57 2009
@@ -50,6 +50,10 @@
if (array_key_exists('ENV', $sections)) {
$this-environmentVariables =
array_merge($this-environmentVariables,
$sections['ENV']-getTestEnvironmentVariables());
}
+if (array_key_exists('GET', $sections)) {
+$this-environmentVariables =
array_merge($this-environmentVariables, $sections['GET']-getGetVariables());
+}
+
}
private function setPhpCommandLineArguments(rtRuntestsConfiguration
$runConfiguration, $sections)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
pajoye Sun Apr 26 09:42:47 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/imap php_imap.c Log: - correct clause http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.39r2=1.208.2.7.2.26.2.40diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.39 php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.40 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.39 Sat Apr 25 16:33:51 2009 +++ php-src/ext/imap/php_imap.c Sun Apr 26 09:42:46 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski z...@zend.com | +--+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.26.2.39 2009/04/25 16:33:51 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.40 2009/04/26 09:42:46 pajoye Exp $ */ #define IMAP41 @@ -1079,7 +1079,7 @@ #if !defined(CCLIENTVERSION) #if HAVE_IMAP2007e #define CCLIENTVERSION 2007e -#elif HAVE_IMAP2007e +#elif HAVE_IMAP2007d #define CCLIENTVERSION 2007d #elif HAVE_IMAP2007b #define CCLIENTVERSION 2007b -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /documentation introduction.txt
spriebsch Sun Apr 26 14:41:02 2009 UTC Added files: /phpruntests/documentation introduction.txt Log: Started introductory documentation. http://cvs.php.net/viewvc.cgi/phpruntests/documentation/introduction.txt?view=markuprev=1.1 Index: phpruntests/documentation/introduction.txt +++ phpruntests/documentation/introduction.txt Introduction to run-tests - runtests is a test environment written in PHP. It is used to tests PHP itself. It is not a replacement for unit test frameworks like PHPUnit. The basic principle of automated tests is very simple. Compare a computed result with some pre-calculated known good, expected value. If both match, the test has passed. If they do not match, the tests failes, and there is probably a bug in PHP, or some precondition for the test was not met. Testing PHP is a far more complex issue than it may seem at first glance, because each test may require an individual PHP configuration, certain settings at operting system level (for example environment variables), or even external services (like databases, LDAP servers or IMAP servers). A test that requires external services can be complex to set up, but there is no way around that. How could you make sure that running a SQL statement against a database works without actually running it against a database? Since a failing test will probably leave its environment in an unpredictable state, a high level of test isolation is required. In other words, this means that we need to set up a new preconfigured PHP process for each test. This is the only way to ensure that every test runs in a clean environment. So, to execute each test, runtests must set up a PHP process, have it run the test, collect the output, and compare it to the pre-calculated known good expected output. That spawned PHP process (hopefully) terminates, so at the process level, we do not have to worry about the potential mess that a test has left behind. Still, if the test has created files, databases, or modified the global system environment, additional work may be required to clean up after the test. Since PHP runs on most of the available platforms, runtests must also run on all these platforms. From an implementation point of view, this means that runtests must work on a minimal, stock PHP installation, and should make as few as possible assumptions on the system environment. All the more or less known cross-platform issues like different line endings, directory separators, case handling, as well as limits of different operating system families (file name path length, include path length) have to be taken into account and being dealt with in runtests. Since runtests spawns off a separate PHP process to run a test, it is not necessary to run each test in the same PHP version that runtests runs on. In other words, that means that you can test a different PHP version than you are actually running - and in fact, it may be a good idea to use a known good PHP version to test a new, less tested PHP version. After all, bugs in the PHP version runtests itself is running on might affect runtests itself, and thus make the test results less reliable. We have already mentioned that tests need an individual environment. Not all tests can be run at the command line, for example. If a test need to make sure that PHP returns correct HTTP header, or processes GET or POST input, the test probably requires the CGI SAPI to run. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
Hannes Magnusson kirjoitti:
-// __DIR__ and FILE_BINARY is available from 5.3.0
+// __DIR__ is available from 5.3.0
if (PHP_VERSION_ID 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
- define('FILE_BINARY', 0);
+ // FILE_BINARY is available from 5.2.7
Greeaat. I love it when people merge random features without any headsup.
The docs say 5.3.0.
http://marc.info/?l=phpdocm=122557917929099w=2
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard strnatcmp.c
iliaa Sun Apr 26 15:53:52 2009 UTC
Modified files:
/php-src/ext/standard strnatcmp.c
Log:
Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/strnatcmp.c?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/standard/strnatcmp.c
diff -u php-src/ext/standard/strnatcmp.c:1.15
php-src/ext/standard/strnatcmp.c:1.16
--- php-src/ext/standard/strnatcmp.c:1.15 Thu Apr 9 16:08:34 2009
+++ php-src/ext/standard/strnatcmp.cSun Apr 26 15:53:52 2009
@@ -38,7 +38,7 @@
#if 0
static char const *version UNUSED =
-$Id: strnatcmp.c,v 1.15 2009/04/09 16:08:34 rasmus Exp $;
+$Id: strnatcmp.c,v 1.16 2009/04/26 15:53:52 iliaa Exp $;
#endif
/* {{{ compare_right
*/
@@ -112,10 +112,10 @@
ca = a[ai]; cb = b[bi];
/* skip over leading spaces or zeros */
- while (isspace((int)(unsigned char)ca) || (ca == '0' (ai+1
a_len)) (a[ai+1] != '.'))
+ while (isspace((int)(unsigned char)ca) || ((ca == '0' (ai+1
a_len)) (a[ai+1] != '.')))
ca = a[++ai];
- while (isspace((int)(unsigned char)cb) || (cb == '0' bi+1
b_len) (b[bi+1] != '.'))
+ while (isspace((int)(unsigned char)cb) || ((cb == '0' bi+1
b_len) (b[bi+1] != '.')))
cb = b[++bi];
/* process run of digits */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: phpruntests / Doxyfile build.xml doxygen.conf
Hi Pierre, Pierre Joye wrote: Similar area, you know phpdocumentor right? Have you heard of Unix? It's often said that it's a better operating system than Windows, and the majority of PHP developers use it. You should thus consider switching to Unix. Seriously: what's the point of your email? I know PHPDocumentor, and I like Doxygen better, period. Anybody else can use PHPDocumentor if they want. Do you also want to complain about the IDE I'm using? Regards, Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt
On 25.04.2009 23:06, Sebastian Schürmann wrote:
sebs Sat Apr 25 19:06:58 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/spl/testsspl_classes.phpt
Log:
Initial import
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/spl_classes.phpt
+++ php-src/ext/spl/tests/spl_classes.phpt
The test seems to be broken:
# cat /local/qa/5_2/ext/spl/tests/spl_classes.diff | less
001+ array(43) {
001- array(54) {
022- [FilesystemIterator]=
023- string(18) FilesystemIterator
026- [GlobIterator]=
027- string(12) GlobIterator
040- [MultipleIterator]=
041- string(16) MultipleIterator
070+ [SimpleXMLIterator]=
071+ string(17) SimpleXMLIterator
070- [RecursiveTreeIterator]=
071- string(21) RecursiveTreeIterator
076+ [SplObjectStorage]=
077+ string(16) SplObjectStorage
078+ [SplObserver]=
079+ string(11) SplObserver
080+ [SplSubject]=
081+ string(10) SplSubject
082+ [SplTempFileObject]=
083+ string(17) SplTempFileObject
084+ [UnderflowException]=
085+ string(18) UnderflowException
086+ [UnexpectedValueException]=
087+ string(24) UnexpectedValueException
088+ }
078- [SplDoublyLinkedList]=
079- string(19) SplDoublyLinkedList
084- [SplFixedArray]=
085- string(13) SplFixedArray
086- [SplHeap]=
087- string(7) SplHeap
088- [SplMinHeap]=
089- string(10) SplMinHeap
090- [SplMaxHeap]=
091- string(10) SplMaxHeap
092- [SplObjectStorage]=
093- string(16) SplObjectStorage
094- [SplObserver]=
095- string(11) SplObserver
096- [SplPriorityQueue]=
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings strcoll.phpt
On 25.04.2009 22:36, Sebastian Schürmann wrote: sebs Sat Apr 25 18:36:05 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strcoll.phpt Log: - Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcoll.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strcoll.phpt +++ php-src/ext/standard/tests/strings/strcoll.phpt This test is broken, too: # cat /local/qa/5_2.zts/ext/standard/tests/strings/strcoll.diff 001+ C: 32 001- C: 1 -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions call_user_method.phpt
On 25.04.2009 22:59, Sebastian Schürmann wrote: sebs Sat Apr 25 18:59:54 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions call_user_method.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/call_user_method.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/call_user_method.phpt +++ php-src/ext/standard/tests/general_functions/call_user_method.phpt And this, too: # cat /local/qa/5_2/ext/standard/tests/general_functions/call_user_method.diff 001+ Strict Standards: Function call_user_method() is deprecated in /local/qa/5_2/ext/standard/tests/general_functions/call_user_method.php on line 8 001- Deprecated: Function call_user_method() is deprecated in %s on line 8 Did you even run these tests at all? -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/versioning php_sapi_name_variation001.phpt
On 25.04.2009 22:29, Sebastian Schürmann wrote: sebs Sat Apr 25 18:29:23 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: Initial commit # cat /local/qa/5_2/ext/standard/tests/versioning/php_sapi_name_variation001.diff 001+ cgi 001- cgi-fcgi -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtPhpTest.php rtTestConfiguration.php
zoe Sun Apr 26 22:43:36 2009 UTC
Modified files:
/phpruntests/src/testcase rtPhpTest.php rtTestConfiguration.php
Log:
Changes to enable GET
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTest.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/src/testcase/rtPhpTest.php
diff -u phpruntests/src/testcase/rtPhpTest.php:1.3
phpruntests/src/testcase/rtPhpTest.php:1.4
--- phpruntests/src/testcase/rtPhpTest.php:1.3 Sat Apr 25 15:04:23 2009
+++ phpruntests/src/testcase/rtPhpTest.php Sun Apr 26 22:43:36 2009
@@ -60,11 +60,13 @@
//Identify the file and expect section types
$this-fileSection = $this-setFileSection();
$this-expectSection = $this-setExpectSection();
+
+$this-fileSection-setExecutableFileName($this-getName());
}
public function init(rtRuntestsConfiguration $runConfiguration)
{
-$this-testConfiguration = new rtTestConfiguration($runConfiguration,
$this-sections, $this-sectionHeadings);
+$this-testConfiguration = new rtTestConfiguration($runConfiguration,
$this-sections, $this-sectionHeadings, $this-fileSection);
}
//run
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.5
phpruntests/src/testcase/rtTestConfiguration.php:1.6
--- phpruntests/src/testcase/rtTestConfiguration.php:1.5Sun Apr 26
07:40:57 2009
+++ phpruntests/src/testcase/rtTestConfiguration.phpSun Apr 26 22:43:36 2009
@@ -21,6 +21,7 @@
private $phpCommandLineArguments;
private $testCommandLineArguments;
private $phpExecutable;
+private $isCgiTest = false;
private $cgiSections = array(
'GET',
'POST',
@@ -31,20 +32,29 @@
'COOKIE',
);
-public function __construct(rtRuntestsConfiguration $runConfiguration,
$sections, $sectionHeadings)
+public function __construct(rtRuntestsConfiguration $runConfiguration,
$sections, $sectionHeadings, $fileSection)
{
-$this-init($runConfiguration, $sections, $sectionHeadings);
+$this-init($runConfiguration, $sections, $sectionHeadings,
$fileSection);
}
-private function init(rtRuntestsConfiguration $runConfiguration,
$sections, $sectionHeadings)
+private function init(rtRuntestsConfiguration $runConfiguration,
$sections, $sectionHeadings, $fileSection)
{
-$this-setEnvironmentVariables($runConfiguration, $sections);
+$this-queryCgiTest($sectionHeadings);
+
+$this-setEnvironmentVariables($runConfiguration, $sections,
$fileSection);
$this-setPhpCommandLineArguments($runConfiguration, $sections);
$this-setTestCommandLineArguments($sections);
$this-setPhpExecutable($runConfiguration, $sectionHeadings);
+
+if($this-isCgiTest) {
+$this-environmentVariables['SCRIPT_FILENAME'] =
$fileSection-getFileName();
+$this-environmentVariables['PATH_TRANSLATED'] =
$fileSection-getFileName();
+//Required by when the cgi has been compiled with
force-cgi-redirect.
+$this-environmentVariables['REDIRECT_STATUS'] = '1';
+}
}
-private function setEnvironmentVariables(rtRuntestsConfiguration
$runConfiguration, $sections)
+private function setEnvironmentVariables(rtRuntestsConfiguration
$runConfiguration, $sections, $fileSection)
{
$this-environmentVariables =
$runConfiguration-getEnvironmentVariables();
if (array_key_exists('ENV', $sections)) {
@@ -77,14 +87,21 @@
private function setPhpExecutable($runConfiguration, $sectionHeadings)
{
-$tempArray = array_diff($this-cgiSections, $sectionHeadings);
-if (count($tempArray) count($this-cgiSections)) {
-$this-phpExecutable =
$runConfiguration-getSetting('PhpCgiExecutable');
+if ($this-isCgiTest) {
+$this-phpExecutable =
$runConfiguration-getSetting('PhpCgiExecutable'). -C;
} else {
$this-phpExecutable =
$runConfiguration-getSetting('PhpExecutable');
}
}
+private function queryCgiTest($sectionHeadings)
+{
+$tempArray = array_diff($this-cgiSections, $sectionHeadings);
+if (count($tempArray) count($this-cgiSections)) {
+$this-isCgiTest = true;
+}
+}
+
public function getPhpExecutable()
{
return $this-phpExecutable;
@@ -93,6 +110,7 @@
public function getEnvironmentVariables()
{
return $this-environmentVariables;
+
}
public function getPhpCommandLineArguments()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/preconditions rtIsSectionImplemented.php
zoe Sun Apr 26 22:43:51 2009 UTC Modified files: /phpruntests/src/testcase/preconditions rtIsSectionImplemented.php Log: Changes to enable GET http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php?r1=1.2r2=1.3diff_format=u Index: phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php diff -u phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.2 phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.3 --- phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.2 Fri Apr 24 08:41:26 2009 +++ phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php Sun Apr 26 22:43:51 2009 @@ -17,6 +17,7 @@ 'CREDITS' = 'rtCreditsSection', 'CLEAN' = 'rtCleanSection', 'XFAIL' = 'rtXfailSection', +'GET' = 'rtGetSection', ); /** Return the message associated with an unimplemented test section -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections rtSection.php
zoe Sun Apr 26 22:44:06 2009 UTC Modified files: /phpruntests/src/testcase/sections rtSection.php Log: Changes to enable GET http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtSection.php?r1=1.2r2=1.3diff_format=u Index: phpruntests/src/testcase/sections/rtSection.php diff -u phpruntests/src/testcase/sections/rtSection.php:1.2 phpruntests/src/testcase/sections/rtSection.php:1.3 --- phpruntests/src/testcase/sections/rtSection.php:1.2 Fri Apr 24 08:41:26 2009 +++ phpruntests/src/testcase/sections/rtSection.php Sun Apr 26 22:44:06 2009 @@ -18,6 +18,7 @@ 'CREDITS' = 'rtCreditsSection', 'CLEAN' = 'rtCleanSection', 'XFAIL' = 'rtXfailSection', +'GET' = 'rtGetSection', ); protected $sectionName; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/executablesections rtFileSection.php
zoe Sun Apr 26 22:44:35 2009 UTC
Modified files:
/phpruntests/src/testcase/sections/executablesections
rtFileSection.php
Log:
Changes to enable GET
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtFileSection.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtFileSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.4
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.5
--- phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.4
Sun Apr 26 07:17:14 2009
+++ phpruntests/src/testcase/sections/executablesections/rtFileSection.php
Sun Apr 26 22:44:35 2009
@@ -25,6 +25,8 @@
*/
class rtFileSection extends rtExecutableSection
{
+private $twoBlankLines = '\r?\n\r?\n';
+
public function setExecutableFileName($testName)
{
$this-fileName = $testName..php;
@@ -33,18 +35,18 @@
public function run(rtPhpTest $testCase, rtRuntestsConfiguration
$runConfiguration)
{
$this-status = array();
-
-$this-setExecutableFileName($testCase-getName());
$this-writeExecutableFile();
$phpExecutable = $testCase-testConfiguration-getPhpExecutable();
-
-// The CGI excutable is null if it is not available, check and SKIP if
appropriate
+
+
+// The CGI excutable is null if it is not available, check and SKIP if
asubstrppropriate
if ($phpExecutable != null) {
$phpCommand = $phpExecutable;
-$phpCommand .= '
'.$testCase-testConfiguration-getPhpCommandLineArguments();
+$phpCommand .= ' '.
$testCase-testConfiguration-getPhpCommandLineArguments();
$phpCommand .= ' -f '.$this-fileName;
$phpCommand .= '
'.$testCase-testConfiguration-getTestCommandLineArguments();
+
$PhpRunner = new rtPhpRunner($phpCommand,
$testCase-testConfiguration-getEnvironmentVariables(),
@@ -53,6 +55,18 @@
try {
$this-output = $PhpRunner-runphp();
+
+//If it's a CGI test sort the headers out here
+if(substr($phpExecutable, -2) == '-C') {
+
+if (preg_match(/^(.*?)$this-twoBlankLines(.*)/s,
$this-output, $match)) {
+$this-output = $match[2];
+$this-headers = $match[1];
+}
+
+}
+
+
} catch (rtPhpRunnerException $e) {
$this-status['fail'] = $e-getMessage();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase rtGetExecutionTest.php
zoe Sun Apr 26 22:44:55 2009 UTC
Added files:
/phpruntests/tests/testcase rtGetExecutionTest.php
Log:
Changes to enable GET
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtGetExecutionTest.php?view=markuprev=1.1
Index: phpruntests/tests/testcase/rtGetExecutionTest.php
+++ phpruntests/tests/testcase/rtGetExecutionTest.php
?php
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../src/rtAutoload.php';
class rtGetExecutionTest extends PHPUnit_Framework_TestCase
{
private $path_to_tests;
private $sample_test;
private $sample_fail;
public function setUp()
{
$this-php = trim(shell_exec(which php));
$this-php_cgi = trim(shell_exec(which php-cgi));
$this-path_to_tests = realpath(dirname(__FILE__) .
'/../../phpt-tests');
$this-sample_test = $this-path_to_tests . '/sample_get.phpt';
}
public function tearDown()
{
@unlink($this-path-to_tests . '/sample_get.php');
}
public function testFileRun()
{
//Create a new test configuration
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this-php, $this-sample_test));
$config-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',$this-php_cgi);
$config-configure();
//Retrieve the array of test file names
$testFiles = $config-getSetting('TestFiles');
//Read the test file
$testFile = new rtPhpTestFile();
$testFile-doRead($testFiles[0]);
$testFile-normaliseLineEndings();
//Create a new test case
$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $config);
//Setup and set the local environment for the test case
$testCase-executeTest($config);
$output = $testCase-getOutput();
$status = $testCase-getStatus();
$this-assertEquals('85', strlen($output));
$this-assertEquals('', $status['pass']);
}
}
?
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase rtTestConfigurationTest.php
zoe Sun Apr 26 22:45:10 2009 UTC
Modified files:
/phpruntests/tests/testcase rtTestConfigurationTest.php
Log:
Changes to enable GET
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.5
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4 Sat Apr 25
15:05:45 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php Sun Apr 26
22:45:10 2009
@@ -12,6 +12,8 @@
$this-sections['ARGS'] = new rtArgsSection('ARGS', array('-vvv -a
value - -2 -v'));
$this-sections['ENV'] = new rtEnvSection('ENV', array('env1 = ENV1',
'env2=ENV2'));
$this-sections['INI'] = new rtIniSection('INI',
array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'));
+$this-sections['FILE'] = new rtFileSection('FILE', array('blah'));
+
}
public function testCreateInstance()
@@ -19,7 +21,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config-configure();
-$testConfiguration = new rtTestConfiguration($config, $this-sections,
array());
+$testConfiguration = new rtTestConfiguration($config, $this-sections,
array(),$this-sections['FILE']);
$this-assertEquals('rtTestConfiguration',
get_class($testConfiguration));
}
@@ -29,7 +31,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config-configure();
-$testConfiguration = new rtTestConfiguration($config, $this-sections,
array());
+$testConfiguration = new rtTestConfiguration($config, $this-sections,
array(), $this-sections['FILE']);
$envVars = $testConfiguration-getEnvironmentVariables();
@@ -41,7 +43,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config-configure();
-$testConfiguration = new rtTestConfiguration($config, $this-sections,
array());
+$testConfiguration = new rtTestConfiguration($config, $this-sections,
array(),$this-sections['FILE']);
$args = $testConfiguration-getTestCommandLineArguments();
@@ -53,7 +55,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config-configure();
-$testConfiguration = new rtTestConfiguration($config, $this-sections,
array());
+$testConfiguration = new rtTestConfiguration($config, $this-sections,
array(),$this-sections['FILE']);
$phpargs = $testConfiguration-getPhpCommandLineArguments();
$match = preg_match(/-d \error_reporting=E_ALL | E_STRICT |
E_DEPRECATED\ -d \assert.active=1\/, $phpargs);
@@ -65,7 +67,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config-configure();
-$testConfiguration = new rtTestConfiguration($config, $this-sections,
array());
+$testConfiguration = new rtTestConfiguration($config, $this-sections,
array(),$this-sections['FILE']);
$phpExe = $testConfiguration-getPhpExecutable();
$this-assertEquals('a-php-exe', $phpExe);
@@ -78,10 +80,10 @@
$config-configure();
-$testConfiguration = new rtTestConfiguration($config, $this-sections,
array('GET'));
+$testConfiguration = new rtTestConfiguration($config, $this-sections,
array('GET'),$this-sections['FILE']);
$phpExe = $testConfiguration-getPhpExecutable();
-$this-assertEquals('a-php-cgi-exe', $phpExe);
+$this-assertEquals('a-php-cgi-exe -C', $phpExe);
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sun Apr 26 23:44:46 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- rmeove duplicate definition
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.281r2=1.282diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.281 php-src/ext/imap/php_imap.c:1.282
--- php-src/ext/imap/php_imap.c:1.281 Sun Apr 26 09:43:39 2009
+++ php-src/ext/imap/php_imap.c Sun Apr 26 23:44:46 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski z...@zend.com |
+--+
*/
-/* $Id: php_imap.c,v 1.281 2009/04/26 09:43:39 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.282 2009/04/26 23:44:46 pajoye Exp $ */
#define IMAP41
@@ -1104,25 +1104,6 @@
{
php_info_print_table_start();
php_info_print_table_row(2, IMAP c-Client Version, CCLIENTVERSION);
-#if HAVE_IMAP2007e
- php_info_print_table_row(2, IMAP c-Client Version, 2007e);
-#elif HAVE_IMAP2007d
- php_info_print_table_row(2, IMAP c-Client Version, 2007d);
-#elif HAVE_IMAP2007b
- php_info_print_table_row(2, IMAP c-Client Version, 2007b);
-#elif HAVE_IMAP2007a
- php_info_print_table_row(2, IMAP c-Client Version, 2007a);
-#elif HAVE_IMAP2004
- php_info_print_table_row(2, IMAP c-Client Version, 2004);
-#elif HAVE_IMAP2001
- php_info_print_table_row(2, IMAP c-Client Version, 2001);
-#elif HAVE_IMAP2000
- php_info_print_table_row(2, IMAP c-Client Version, 2000);
-#elif defined(IMAP41)
- php_info_print_table_row(2, IMAP c-Client Version, 4.1);
-#else
- php_info_print_table_row(2, IMAP c-Client Version, 4.0);
-#endif
#if HAVE_IMAP_SSL
php_info_print_table_row(2, SSL Support, enabled);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt
sebsSun Apr 26 23:54:12 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl/tests spl_classes.phpt
/php-src/ext/standard/tests/general_functions call_user_method.phpt
/php-src/ext/standard/tests/versioning
php_sapi_name_variation001.phpt
Log:
- fixes to tests
- spl_classes only checks for is_array(), the output in 5_3_0 and 5_2_0 is
very different,
test will run this way in 5.2 and 5.3 w.o. problems
- call user method recognizes the different errormessage in 5_2_0 now
- the php_sap_name_variation001 check now goes for cgi instead of the
cgi-fcgi output string
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/spl/tests/spl_classes.phpt
diff -u php-src/ext/spl/tests/spl_classes.phpt:1.2.2.2
php-src/ext/spl/tests/spl_classes.phpt:1.2.2.3
--- php-src/ext/spl/tests/spl_classes.phpt:1.2.2.2 Sat Apr 25 19:06:58 2009
+++ php-src/ext/spl/tests/spl_classes.phpt Sun Apr 26 23:54:12 2009
@@ -6,118 +6,8 @@
Testfest 2009 Munich
--FILE--
?php
-var_dump(spl_classes());
+var_dump(is_array(spl_classes()));
?
--EXPECT--
-array(54) {
- [AppendIterator]=
- string(14) AppendIterator
- [ArrayIterator]=
- string(13) ArrayIterator
- [ArrayObject]=
- string(11) ArrayObject
- [BadFunctionCallException]=
- string(24) BadFunctionCallException
- [BadMethodCallException]=
- string(22) BadMethodCallException
- [CachingIterator]=
- string(15) CachingIterator
- [Countable]=
- string(9) Countable
- [DirectoryIterator]=
- string(17) DirectoryIterator
- [DomainException]=
- string(15) DomainException
- [EmptyIterator]=
- string(13) EmptyIterator
- [FilesystemIterator]=
- string(18) FilesystemIterator
- [FilterIterator]=
- string(14) FilterIterator
- [GlobIterator]=
- string(12) GlobIterator
- [InfiniteIterator]=
- string(16) InfiniteIterator
- [InvalidArgumentException]=
- string(24) InvalidArgumentException
- [IteratorIterator]=
- string(16) IteratorIterator
- [LengthException]=
- string(15) LengthException
- [LimitIterator]=
- string(13) LimitIterator
- [LogicException]=
- string(14) LogicException
- [MultipleIterator]=
- string(16) MultipleIterator
- [NoRewindIterator]=
- string(16) NoRewindIterator
- [OuterIterator]=
- string(13) OuterIterator
- [OutOfBoundsException]=
- string(20) OutOfBoundsException
- [OutOfRangeException]=
- string(19) OutOfRangeException
- [OverflowException]=
- string(17) OverflowException
- [ParentIterator]=
- string(14) ParentIterator
- [RangeException]=
- string(14) RangeException
- [RecursiveArrayIterator]=
- string(22) RecursiveArrayIterator
- [RecursiveCachingIterator]=
- string(24) RecursiveCachingIterator
- [RecursiveDirectoryIterator]=
- string(26) RecursiveDirectoryIterator
- [RecursiveFilterIterator]=
- string(23) RecursiveFilterIterator
- [RecursiveIterator]=
- string(17) RecursiveIterator
- [RecursiveIteratorIterator]=
- string(25) RecursiveIteratorIterator
- [RecursiveRegexIterator]=
- string(22) RecursiveRegexIterator
- [RecursiveTreeIterator]=
- string(21) RecursiveTreeIterator
- [RegexIterator]=
- string(13) RegexIterator
- [RuntimeException]=
- string(16) RuntimeException
- [SeekableIterator]=
- string(16) SeekableIterator
- [SplDoublyLinkedList]=
- string(19) SplDoublyLinkedList
- [SplFileInfo]=
- string(11) SplFileInfo
- [SplFileObject]=
- string(13) SplFileObject
- [SplFixedArray]=
- string(13) SplFixedArray
- [SplHeap]=
- string(7) SplHeap
- [SplMinHeap]=
- string(10) SplMinHeap
- [SplMaxHeap]=
- string(10) SplMaxHeap
- [SplObjectStorage]=
- string(16) SplObjectStorage
- [SplObserver]=
- string(11) SplObserver
- [SplPriorityQueue]=
- string(16) SplPriorityQueue
- [SplQueue]=
- string(8) SplQueue
- [SplStack]=
- string(8) SplStack
- [SplSubject]=
- string(10) SplSubject
- [SplTempFileObject]=
- string(17) SplTempFileObject
- [UnderflowException]=
- string(18) UnderflowException
- [UnexpectedValueException]=
- string(24) UnexpectedValueException
-}
-
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/call_user_method.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/general_functions/call_user_method.phpt
diff -u
php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.1.4.2
php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.1.4.3
--- php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.1.4.2
Sat Apr 25 18:59:54 2009
+++ php-src/ext/standard/tests/general_functions/call_user_method.phpt Sun Apr
26 23:54:12 2009
@@ -16,5 +16,6 @@
var_dump($res);
?
--EXPECTF--
-Deprecated: Function call_user_method() is deprecated in %s on line 8
+Strict Standards: Function call_user_method() is deprecated in %s
bool(true)
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
pajoye Mon Apr 27 00:00:43 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- remove duplicate definition
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.40r2=1.208.2.7.2.26.2.41diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.40
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.41
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.40 Sun Apr 26 09:42:46 2009
+++ php-src/ext/imap/php_imap.c Mon Apr 27 00:00:42 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski z...@zend.com |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.40 2009/04/26 09:42:46 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.41 2009/04/27 00:00:42 pajoye Exp $ */
#define IMAP41
@@ -1104,25 +1104,6 @@
{
php_info_print_table_start();
php_info_print_table_row(2, IMAP c-Client Version, CCLIENTVERSION);
-#if HAVE_IMAP2007e
- php_info_print_table_row(2, IMAP c-Client Version, 2007e);
-#elif HAVE_IMAP2007d
- php_info_print_table_row(2, IMAP c-Client Version, 2007d);
-#elif HAVE_IMAP2007b
- php_info_print_table_row(2, IMAP c-Client Version, 2007b);
-#elif HAVE_IMAP2007a
- php_info_print_table_row(2, IMAP c-Client Version, 2007a);
-#elif HAVE_IMAP2004
- php_info_print_table_row(2, IMAP c-Client Version, 2004);
-#elif HAVE_IMAP2001
- php_info_print_table_row(2, IMAP c-Client Version, 2001);
-#elif HAVE_IMAP2000
- php_info_print_table_row(2, IMAP c-Client Version, 2000);
-#elif defined(IMAP41)
- php_info_print_table_row(2, IMAP c-Client Version, 4.1);
-#else
- php_info_print_table_row(2, IMAP c-Client Version, 4.0);
-#endif
#if HAVE_IMAP_SSL
php_info_print_table_row(2, SSL Support, enabled);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap php_imap.c
pajoye Mon Apr 27 00:01:16 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/imap php_imap.c Log: - MFH: add latest cclient versions http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.47r2=1.208.2.7.2.48diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.47 php-src/ext/imap/php_imap.c:1.208.2.7.2.48 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.47 Sat Apr 25 16:36:02 2009 +++ php-src/ext/imap/php_imap.c Mon Apr 27 00:01:15 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski z...@zend.com | +--+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.47 2009/04/25 16:36:02 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.48 2009/04/27 00:01:15 pajoye Exp $ */ #define IMAP41 @@ -719,8 +719,17 @@ } /* }}} */ + #if !defined(CCLIENTVERSION) -#if HAVE_IMAP2004 +#if HAVE_IMAP2007e +#define CCLIENTVERSION 2007e +#elif HAVE_IMAP2007d +#define CCLIENTVERSION 2007d +#elif HAVE_IMAP2007b +#define CCLIENTVERSION 2007b +#elif HAVE_IMAP2007a +#define CCLIENTVERSION 2007a +#elif HAVE_IMAP2004 #define CCLIENTVERSION 2004 #elif HAVE_IMAP2001 #define CCLIENTVERSION 2001 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests spl_classes.phpt
sebsMon Apr 27 00:08:21 2009 UTC
Modified files:
/php-src/ext/spl/tests spl_classes.phpt
Log:
- fixing spl_classes test here as well
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/spl_classes.phpt
diff -u php-src/ext/spl/tests/spl_classes.phpt:1.2
php-src/ext/spl/tests/spl_classes.phpt:1.3
--- php-src/ext/spl/tests/spl_classes.phpt:1.2 Sat Apr 25 19:06:26 2009
+++ php-src/ext/spl/tests/spl_classes.phpt Mon Apr 27 00:08:21 2009
@@ -6,118 +6,8 @@
Testfest 2009 Munich
--FILE--
?php
-var_dump(spl_classes());
+var_dump(is_array(spl_classes()));
?
--EXPECT--
-array(54) {
- [AppendIterator]=
- string(14) AppendIterator
- [ArrayIterator]=
- string(13) ArrayIterator
- [ArrayObject]=
- string(11) ArrayObject
- [BadFunctionCallException]=
- string(24) BadFunctionCallException
- [BadMethodCallException]=
- string(22) BadMethodCallException
- [CachingIterator]=
- string(15) CachingIterator
- [Countable]=
- string(9) Countable
- [DirectoryIterator]=
- string(17) DirectoryIterator
- [DomainException]=
- string(15) DomainException
- [EmptyIterator]=
- string(13) EmptyIterator
- [FilesystemIterator]=
- string(18) FilesystemIterator
- [FilterIterator]=
- string(14) FilterIterator
- [GlobIterator]=
- string(12) GlobIterator
- [InfiniteIterator]=
- string(16) InfiniteIterator
- [InvalidArgumentException]=
- string(24) InvalidArgumentException
- [IteratorIterator]=
- string(16) IteratorIterator
- [LengthException]=
- string(15) LengthException
- [LimitIterator]=
- string(13) LimitIterator
- [LogicException]=
- string(14) LogicException
- [MultipleIterator]=
- string(16) MultipleIterator
- [NoRewindIterator]=
- string(16) NoRewindIterator
- [OuterIterator]=
- string(13) OuterIterator
- [OutOfBoundsException]=
- string(20) OutOfBoundsException
- [OutOfRangeException]=
- string(19) OutOfRangeException
- [OverflowException]=
- string(17) OverflowException
- [ParentIterator]=
- string(14) ParentIterator
- [RangeException]=
- string(14) RangeException
- [RecursiveArrayIterator]=
- string(22) RecursiveArrayIterator
- [RecursiveCachingIterator]=
- string(24) RecursiveCachingIterator
- [RecursiveDirectoryIterator]=
- string(26) RecursiveDirectoryIterator
- [RecursiveFilterIterator]=
- string(23) RecursiveFilterIterator
- [RecursiveIterator]=
- string(17) RecursiveIterator
- [RecursiveIteratorIterator]=
- string(25) RecursiveIteratorIterator
- [RecursiveRegexIterator]=
- string(22) RecursiveRegexIterator
- [RecursiveTreeIterator]=
- string(21) RecursiveTreeIterator
- [RegexIterator]=
- string(13) RegexIterator
- [RuntimeException]=
- string(16) RuntimeException
- [SeekableIterator]=
- string(16) SeekableIterator
- [SplDoublyLinkedList]=
- string(19) SplDoublyLinkedList
- [SplFileInfo]=
- string(11) SplFileInfo
- [SplFileObject]=
- string(13) SplFileObject
- [SplFixedArray]=
- string(13) SplFixedArray
- [SplHeap]=
- string(7) SplHeap
- [SplMinHeap]=
- string(10) SplMinHeap
- [SplMaxHeap]=
- string(10) SplMaxHeap
- [SplObjectStorage]=
- string(16) SplObjectStorage
- [SplObserver]=
- string(11) SplObserver
- [SplPriorityQueue]=
- string(16) SplPriorityQueue
- [SplQueue]=
- string(8) SplQueue
- [SplStack]=
- string(8) SplStack
- [SplSubject]=
- string(10) SplSubject
- [SplTempFileObject]=
- string(17) SplTempFileObject
- [UnderflowException]=
- string(18) UnderflowException
- [UnexpectedValueException]=
- string(24) UnexpectedValueException
-}
-
+bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt
Hi Sebastian 2009/4/27 Sebastian Schürmann s...@php.net: sebs Sun Apr 26 23:54:12 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl/tests spl_classes.phpt /php-src/ext/standard/tests/general_functions call_user_method.phpt /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: - fixes to tests - spl_classes only checks for is_array(), the output in 5_3_0 and 5_2_0 is very different, test will run this way in 5.2 and 5.3 w.o. problems - call user method recognizes the different errormessage in 5_2_0 now - the php_sap_name_variation001 check now goes for cgi instead of the cgi-fcgi output string --FILE-- ?php -var_dump(spl_classes()); +var_dump(is_array(spl_classes())); ? The only thing thats different with spl_classes() in 5.2 5.3+ is just that in 5.3 a few more classes have been added, I still think its better to have them listed else the test seems pretty much pointless here as spl_classes() always returns an array. --EXPECT-- [snip] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php regrads -- Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
AW: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt
Hey. I will add some variants that are working with pass sections for each PHP Version. Sebastian - Ursprüngliche Mail Von: Kalle Sommer Nielsen ka...@php.net An: Sebastian Schürmann s...@php.net CC: php-cvs@lists.php.net Gesendet: Montag, den 27. April 2009, 02:09:41 Uhr Betreff: Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt Hi Sebastian 2009/4/27 Sebastian Schürmann s...@php.net: sebsSun Apr 26 23:54:12 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl/tests spl_classes.phpt /php-src/ext/standard/tests/general_functions call_user_method.phpt /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: - fixes to tests - spl_classes only checks for is_array(), the output in 5_3_0 and 5_2_0 is very different, test will run this way in 5.2 and 5.3 w.o. problems - call user method recognizes the different errormessage in 5_2_0 now - the php_sap_name_variation001 check now goes for cgi instead of the cgi-fcgi output string --FILE-- ?php -var_dump(spl_classes()); +var_dump(is_array(spl_classes())); ? The only thing thats different with spl_classes() in 5.2 5.3+ is just that in 5.3 a few more classes have been added, I still think its better to have them listed else the test seems pretty much pointless here as spl_classes() always returns an array. --EXPECT-- [snip] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php regrads -- Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
AW: AW: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt
And: Thanks for the feedback ;) S. - Ursprüngliche Mail Von: S. Schürmann sschuermann...@yahoo.de An: Kalle Sommer Nielsen ka...@php.net; Sebastian Schürmann s...@php.net CC: php-cvs@lists.php.net Gesendet: Montag, den 27. April 2009, 02:13:26 Uhr Betreff: AW: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt Hey. I will add some variants that are working with pass sections for each PHP Version. Sebastian - Ursprüngliche Mail Von: Kalle Sommer Nielsen ka...@php.net An: Sebastian Schürmann s...@php.net CC: php-cvs@lists.php.net Gesendet: Montag, den 27. April 2009, 02:09:41 Uhr Betreff: Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests spl_classes.phpt /ext/standard/tests/general_functions call_user_method.phpt /ext/standard/tests/versioning php_sapi_name_variation001.phpt Hi Sebastian 2009/4/27 Sebastian Schürmann s...@php.net: sebsSun Apr 26 23:54:12 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl/tests spl_classes.phpt /php-src/ext/standard/tests/general_functions call_user_method.phpt /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: - fixes to tests - spl_classes only checks for is_array(), the output in 5_3_0 and 5_2_0 is very different, test will run this way in 5.2 and 5.3 w.o. problems - call user method recognizes the different errormessage in 5_2_0 now - the php_sap_name_variation001 check now goes for cgi instead of the cgi-fcgi output string --FILE-- ?php -var_dump(spl_classes()); +var_dump(is_array(spl_classes())); ? The only thing thats different with spl_classes() in 5.2 5.3+ is just that in 5.3 a few more classes have been added, I still think its better to have them listed else the test seems pretty much pointless here as spl_classes() always returns an array. --EXPECT-- [snip] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php regrads -- Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration/settings rtCurrentDirectorySetting.php rtPhpCgiExecutableSetting.php rtPhpExecutableSetting.php
zoe Sun Apr 26 06:54:12 2009 UTC
Modified files:
/phpruntests/src/configuration/settings rtPhpExecutableSetting.php
rtPhpCgiExecutableSetting.php
rtCurrentDirectorySetting.php
Log:
Changes to the wy that the CGI executable is set
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpExecutableSetting.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpExecutableSetting.php
diff -u phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.3
phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.4
--- phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.3
Fri Apr 24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtPhpExecutableSetting.php Sun Apr
26 06:54:12 2009
@@ -9,23 +9,18 @@
const SAPI_CLI = /sapi/cli/php;
private $phpExecutable;
-
+
/**
* Sets the PHP executable, note the dependency on working directory
*
*/
public function init(rtRuntestsConfiguration $configuration)
{
-if (is_null($configuration-getSetting('workingDirectory'))) {
-$workingDir = 'WORKING_DIR';
-} else {
-$workingDir = $configuration-getSetting('workingDirectory');
-}
-
+
if ($configuration-hasEnvironmentVariable('TEST_PHP_EXECUTABLE')) {
-if ($configuration-getEnvironmentVariable('TEST_PHP_EXECUTABLE')
== 'auto') {
-$this-phpExecutable = $workingDir.self::SAPI_CLI;
+if ($configuration-getEnvironmentVariable('TEST_PHP_EXECUTABLE')
== 'auto') {
+$this-phpExecutable =
$configuration-getSetting('WorkingDirectory').self::SAPI_CLI;
} else {
$this-phpExecutable =
$configuration-getEnvironmentVariable('TEST_PHP_EXECUTABLE');
}
@@ -43,7 +38,7 @@
public function get()
{
return $this-phpExecutable;
-}
+}
}
?
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
diff -u
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.4
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.5
--- phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.4
Sat Apr 25 17:18:23 2009
+++ phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
Sun Apr 26 06:54:12 2009
@@ -16,15 +16,11 @@
*/
public function init(rtRuntestsConfiguration $configuration)
{
-if (is_null($configuration-getSetting('workingDirectory'))) {
-$workingDir = 'WORKING_DIR';
-} else {
-$workingDir = $configuration-getSetting('workingDirectory');
-}
+
if ($configuration-hasEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE'))
{
if
($configuration-getEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE') == 'auto') {
-$this-phpCgiExecutable = $workingDir . self::SAPI_CGI;
+$this-phpCgiExecutable =
$configuration-getSetting('WorkingDirectory') . self::SAPI_CGI;
} else {
$this-phpCgiExecutable =
$configuration-getEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE');
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php
diff -u
phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php:1.2
phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php:1.3
--- phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/settings/rtCurrentDirectorySetting.php
Sun Apr 26 06:54:12 2009
@@ -14,7 +14,7 @@
*/
public function init(rtRuntestsConfiguration $configuration)
{
-$this-currentDirectory = getcwd();
+$this-currentDirectory = realpath(getcwd());
}
/**
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration rtRuntestsConfiguration.php
zoe Sun Apr 26 06:54:01 2009 UTC
Modified files:
/phpruntests/src/configuration rtRuntestsConfiguration.php
Log:
Changes to the wy that the CGI executable is set
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtRuntestsConfiguration.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/configuration/rtRuntestsConfiguration.php
diff -u phpruntests/src/configuration/rtRuntestsConfiguration.php:1.4
phpruntests/src/configuration/rtRuntestsConfiguration.php:1.5
--- phpruntests/src/configuration/rtRuntestsConfiguration.php:1.4 Sat Apr
25 17:18:13 2009
+++ phpruntests/src/configuration/rtRuntestsConfiguration.php Sun Apr 26
06:54:00 2009
@@ -1,9 +1,30 @@
?php
/**
- * Contains onfiguration for test run. Includes:
- * Command line option, environment variables, ini overrides and settings
which are
- * derived from one or more command line options or environment variables.
+ * rtRuntestsConfiguration
*
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
+ */
+
+/**
+ * Sets up the configuration for the whole test run
+ *
+ * Settings are derived from command line options and/or environment variables.
+ * Runtests also overrides a number of ini settings.
+ *
+ *
+ * @category Testing
+ * @package RUNTESTS
+ * @authorZoe Slattery z...@php.net
+ * @authorStefan Priebsch sprieb...@php.net
+ * @copyright 2009 The PHP Group
+ * @license http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link http://qa.php.net/
*/
abstract class rtRuntestsConfiguration
{
@@ -16,12 +37,12 @@
private $settingNames = array (
'CurrentDirectory' = 'rtCurrentDirectorySetting',
+'WorkingDirectory' = 'rtWorkingDirectorySetting',
'LogFormat' = 'rtLogFormatSetting',
'PhpExecutable' = 'rtPhpExecutableSetting',
'PhpCgiExecutable' = 'rtPhpCgiExecutableSetting',
'TestFiles' = 'rtTestFileSetting',
'TestDirectories' = 'rtTestDirectorySetting',
-'WorkingDirectory' = 'rtWorkingDirectorySetting',
'PhpCommandLineArguments' = 'rtPhpCommandLineArgSetting',
);
@@ -50,12 +71,10 @@
//set configuration
foreach ($this-settingNames as $name = $setting) {
$this-setters[$name] = new $setting($this);
-}
-
-foreach ($this-settingNames as $name = $setting) {
$methodName = 'set' . $name;
$this-$methodName();
}
+
}
/**
@@ -76,7 +95,7 @@
* Sets the directory that run-tests was started from
*
*/
-private function setCurrentDirectory()
+private function setCurrentDirectory()
{
$this-settings['CurrentDirectory']=
$this-setters['CurrentDirectory']-get();
}
@@ -104,12 +123,12 @@
*
*/
private function setPhpCgiExecutable()
-{
-//If the CGI executable hasn't been set using an environmental
variable or 'auto', try and derive it from
+{
+//If the CGI executable hasn't been set using an environmental
variable or 'auto', try and derive it from
//the name of the cli executable.
//TODO This is *ix specific, need a WIN specific class
PhpCgiExecutable setting class
if($this-setters['PhpCgiExecutable']-get() == null) {
-
$this-setters['PhpCgiExecutable']-setFromPhpCli($this-settings['PhpExecutable']);
+
$this-setters['PhpCgiExecutable']-setFromPhpCli($this-settings['PhpExecutable']);
}
$this-settings['PhpCgiExecutable']=
$this-setters['PhpCgiExecutable']-get();
}
@@ -177,7 +196,7 @@
{
return $this-environmentVariables-getVariable($name);
}
-
+
public function getEnvironmentVariables()
{
return $this-environmentVariables-getVariables();
@@ -192,7 +211,7 @@
{
return $this-commandLine-getOption($option);
}
-
+
public function hasEnvironmentVariable($name)
{
return $this-environmentVariables-hasVariable($name);
@@ -209,7 +228,7 @@
{
$this-environmentVariables-setVariable($name, $value);
}
-
+
public function getTestFilename()
{
return $this-commandLine-getTestFilename();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/configuration/settings rtCurrentDirectorySettingTest.php rtPhpCgiExecutableSettingTest.php rtPhpExecutableSettingTest.php
zoe Sun Apr 26 06:54:34 2009 UTC
Modified files:
/phpruntests/tests/configuration/settings
rtPhpExecutableSettingTest.php
rtCurrentDirectorySettingTest.php
rtPhpCgiExecutableSettingTest.php
Log:
Changes to the wy that the CGI executable is set
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/settings/rtPhpExecutableSettingTest.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/tests/configuration/settings/rtPhpExecutableSettingTest.php
diff -u
phpruntests/tests/configuration/settings/rtPhpExecutableSettingTest.php:1.3
phpruntests/tests/configuration/settings/rtPhpExecutableSettingTest.php:1.4
--- phpruntests/tests/configuration/settings/rtPhpExecutableSettingTest.php:1.3
Fri Apr 24 09:42:01 2009
+++ phpruntests/tests/configuration/settings/rtPhpExecutableSettingTest.php
Sun Apr 26 06:54:34 2009
@@ -24,14 +24,22 @@
$this-assertEquals('a-php-executable', $clisetting-get());
}
-public function testSetPhpExecutableEVAuto()
+public function testSetPhpExecutableEvAuto()
{
$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
$configuration-setEnvironmentVariable('TEST_PHP_EXECUTABLE', 'auto');
+$configuration-setEnvironmentVariable('TEST_PHP_SRCDIR',
'/some/directory');
+$configuration-configure();
+$this-assertEquals('/some/directory/sapi/cli/php',
$configuration-getSetting('PhpExecutable'));
+}
-$clisetting = new rtPhpExecutableSetting($configuration);
+public function testSetPhpExecutableCwdAuto()
+{
+$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
+$configuration-setEnvironmentVariable('TEST_PHP_EXECUTABLE', 'auto');
+$configuration-configure();
-$this-assertEquals('WORKING_DIR/sapi/cli/php', $clisetting-get());
+$this-assertEquals(realpath(getcwd()).'/sapi/cli/php',
$configuration-getSetting('PhpExecutable'));
}
}
?
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/settings/rtCurrentDirectorySettingTest.php?r1=1.2r2=1.3diff_format=u
Index:
phpruntests/tests/configuration/settings/rtCurrentDirectorySettingTest.php
diff -u
phpruntests/tests/configuration/settings/rtCurrentDirectorySettingTest.php:1.2
phpruntests/tests/configuration/settings/rtCurrentDirectorySettingTest.php:1.3
---
phpruntests/tests/configuration/settings/rtCurrentDirectorySettingTest.php:1.2
Mon Apr 20 20:50:39 2009
+++ phpruntests/tests/configuration/settings/rtCurrentDirectorySettingTest.php
Sun Apr 26 06:54:34 2009
@@ -10,7 +10,7 @@
$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', '-p', 'a-php-exe',
'test.phpt'));
$dirsetting = new rtCurrentDirectorySetting($configuration);
-$this-assertEquals(getcwd(), $dirsetting-get());
+$this-assertEquals(realpath(getcwd()), $dirsetting-get());
}
}
?
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php?r1=1.3r2=1.4diff_format=u
Index:
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
diff -u
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php:1.3
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php:1.4
---
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php:1.3
Sat Apr 25 17:18:37 2009
+++ phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
Sun Apr 26 06:54:34 2009
@@ -8,34 +8,26 @@
public function testSetPhpCgiExecutableEV() {
$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
$configuration-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',
'a-php-executable');
-
$cgisetting = new rtPhpCgiExecutableSetting($configuration);
-
$this-assertEquals('a-php-executable', $cgisetting-get());
}
public function testSetPhpCgiExecutableEVAuto() {
-$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
+$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php','-p', 'a-php-exe',
'test.phpt'));
$configuration-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',
'auto');
-
-$cgisetting = new rtPhpCgiExecutableSetting($configuration);
-
-$this-assertEquals('WORKING_DIR/sapi/cgi/php', $cgisetting-get());
+$configuration-configure();
+$this-assertEquals(realpath(getcwd()).'/sapi/cgi/php',
$configuration-getSetting('PhpCgiExecutable'));
}
public function testSetPhpCgiExecutableNotSet() {
$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php',
