From e2223f869a4fb08dc27a19310627fae3b7bdced4 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:12:23 +0100 Subject: [PATCH 01/14] Add basic runtime tests --- tests/AppserverIo/Php/Runtime/RuntimeTest.php | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/tests/AppserverIo/Php/Runtime/RuntimeTest.php b/tests/AppserverIo/Php/Runtime/RuntimeTest.php index 55c425d..be50fb5 100644 --- a/tests/AppserverIo/Php/Runtime/RuntimeTest.php +++ b/tests/AppserverIo/Php/Runtime/RuntimeTest.php @@ -24,7 +24,7 @@ namespace AppserverIo\Php\Runtime; /** - * Dummy test implementation. + * Runtime test implementations. * * @category Appserver * @package Psr @@ -39,12 +39,27 @@ class RuntimeTest extends \PHPUnit_Framework_TestCase { /** - * A dummy test implementation. + * Tests if pthreads is available. * * @return void */ - public function testDummy() + public function testPthreadsAvailable() { - $this->assertTrue(true); + $this->assertTrue(extension_loaded('pthreads')); + } + + /** + * Tests if the threaded classes are available. + * + * @return void + */ + public function testThreadClassAvailable() + { + $this->assertTrue(class_exists('\Pool')); + $this->assertTrue(class_exists('\Cond')); + $this->assertTrue(class_exists('\Mutex')); + $this->assertTrue(class_exists('\Thread')); + $this->assertTrue(class_exists('\Worker')); + $this->assertTrue(class_exists('\Stackable')); } } From 20dec313e0025b50961328a3108bea27d67fc720 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:17:14 +0100 Subject: [PATCH 02/14] Refactor travis.yml --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ab2e3e..73e3b6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,11 @@ language: objective-c php: - 5.4 - 5.5 - -matrix: - allow_failures: - - php: 5.5 script: - - sudo ant -Dos.family=mac create-pkg + - ant composer-init + - sudo ant build + - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml notifications: email: tw@techdivision.com From b2e20e7f8e1de7513dbdc3cdeef35cdb98770786 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:21:11 +0100 Subject: [PATCH 03/14] Dummy change to initiate Travis-CI build process --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73e3b6b..873e189 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ php: - 5.5 script: - - ant composer-init + - sudo ant composer-init - sudo ant build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml From 21cd901319dd98efd87bd7774ef92efd66ef09ff Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:27:50 +0100 Subject: [PATCH 04/14] Change language from objective-c to php in travis.yml file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 873e189..e62e34e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: objective-c +language: php php: - 5.4 From 91a3a4c0893c8512c36375bfc40907a9c407329e Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:38:02 +0100 Subject: [PATCH 05/14] Minor changes in build properties inclusion order --- build.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index db032db..5bf2147 100644 --- a/build.xml +++ b/build.xml @@ -30,6 +30,11 @@ + + + + + @@ -48,12 +53,6 @@ - - - - - - From 6a29c05412e0578984f42000be693c76866ab7de Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:41:34 +0100 Subject: [PATCH 06/14] Minor changes in build properties inclusion order --- .travis.yml | 10 +++++----- build.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e62e34e..18e24ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: php -php: - - 5.4 - - 5.5 +before_install: + - phpenv rehash + - wget https://scrutinizer-ci.com/ocular.phar script: - - sudo ant composer-init - - sudo ant build + - ant composer-init + - ant build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml notifications: diff --git a/build.xml b/build.xml index 5bf2147..27db12d 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ - + From 80e4db65bf6412d3fc4f58605fd39e6df22db4a1 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:53:42 +0100 Subject: [PATCH 07/14] Refactoring --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18e24ac..c9eb889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,15 @@ -language: php +language: objective-c +php: + - 5.5 + before_install: - phpenv rehash - wget https://scrutinizer-ci.com/ocular.phar script: - - ant composer-init - - ant build + - sudo ant -Dos.family=mac composer-init + - sudo ant -Dos.family=mac build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml notifications: From f625f1086f7633034195684af8c241d99e1e83bd Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 11:56:00 +0100 Subject: [PATCH 08/14] Refactoring --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9eb889..95661f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ php: - 5.5 before_install: - - phpenv rehash - wget https://scrutinizer-ci.com/ocular.phar script: From 4e272953ebfb38a3bc07fb8c1ce3cb9b6125c19a Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 12:08:04 +0100 Subject: [PATCH 09/14] Refactoring --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95661f5..1c0c3e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,11 @@ -language: objective-c - -php: - - 5.5 +language: java before_install: - wget https://scrutinizer-ci.com/ocular.phar script: - - sudo ant -Dos.family=mac composer-init - - sudo ant -Dos.family=mac build + - sudo ant composer-init + - sudo ant build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml notifications: From 58d5c1fb6de601ba2be7206870082b862ebc0365 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 13:42:52 +0100 Subject: [PATCH 10/14] Refactoring --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c0c3e9..f000c51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,12 @@ language: java - + before_install: - wget https://scrutinizer-ci.com/ocular.phar script: - - sudo ant composer-init - - sudo ant build + - sudo chown $USER /opt + - ant composer-init + - ant build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml notifications: From 241df90e3cf499af8f9f2843eaf3c039700a13a5 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 13:45:22 +0100 Subject: [PATCH 11/14] Refactoring --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f000c51..4c0a0e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: java +language: php before_install: - wget https://scrutinizer-ci.com/ocular.phar From bf4a3b9da7c14233f3f8614df7066055da575162 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 13:54:01 +0100 Subject: [PATCH 12/14] Change path to php-ext-appserver PECL extension --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 27db12d..75f07e8 100644 --- a/build.xml +++ b/build.xml @@ -438,7 +438,7 @@ - + @@ -1854,7 +1854,7 @@ - + From ca11a26fdeb7a45ef6dd704134bfc9a9113cdb9d Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 13:56:01 +0100 Subject: [PATCH 13/14] Change path to php-ext-appserver PECL extension --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c0a0e2..b8b10a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ before_install: script: - sudo chown $USER /opt + - sudo ant -Dprepare.distribution.build=true prepare-linux-build-system - ant composer-init - - ant build + - ant -Dprepare.distribution.build=false build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml notifications: From 9df4d2903a2f6a5fb90d084ce83f265812e26e25 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Mon, 24 Nov 2014 14:10:54 +0100 Subject: [PATCH 14/14] Remove Linux distribution preparation --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8b10a1..66d78a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ before_install: script: - sudo chown $USER /opt - - sudo ant -Dprepare.distribution.build=true prepare-linux-build-system - ant composer-init - ant -Dprepare.distribution.build=false build - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml