separated patched and addtional Zend Framework 1 classes

... and improves/fixes unittest bootstrapping / autoloading

Change-Id: I4ed49a464d3a4857b252c5115164fb27efcd6b97
Reviewed-on: https://gerrit.tine20.org/tine20/3144
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>

diff --git a/tests/tine20/ServerTestCase.php b/tests/tine20/ServerTestCase.php
index faf673a..b9c1876 100644 (file)
--- a/tests/tine20/ServerTestCase.php
+++ b/tests/tine20/ServerTestCase.php
@@ -63,6 +63,20 @@ abstract class ServerTestCase extends PHPUnit_Framework_TestCase
     }
     
     /**
+     * Performs custom preparations on the process isolation template.
+     *
+     * @param Text_Template $template
+     * @since Method available since Release 3.4.0
+     */
+    protected function prepareTemplate(Text_Template $template)
+    {
+        // needed to get bootstrap file included in separate process again
+        $template->setVar(array(
+            'globals' => sprintf("\$GLOBALS['__PHPUNIT_BOOTSTRAP'] = '%s/bootstrap.php';", __DIR__)
+        ));
+    }
+    
+    /**
      * fetch test user credentials
      * 
      * @return array

diff --git a/tests/tine20/ServerTestHelper.php b/tests/tine20/ServerTestHelper.php
deleted file mode 100644 (file)
index ef697e5..0000000
--- a/tests/tine20/ServerTestHelper.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Tine 2.0
- * 
- * @package     tests
- * @subpackage  test root
- * @license     http://www.gnu.org/licenses/agpl.html AGPL3
- * @copyright   Copyright (c) 2008 Metaways Infosystems GmbH (http://www.metaways.de)
- * @author      Matthias Greiling <m.greiling@metaways.de>
- */
-
-/*
- * Set error reporting 
- * 
- * @todo put that in config.inc as well?
- */
-error_reporting( E_ALL | E_STRICT );
-
-/*
- * Set include path
- */
-define('PATH_TO_REAL_DIR', dirname(__FILE__). '/../../tine20');
-define('PATH_TO_TINE_LIBRARY', dirname(__FILE__). '/../../tine20/library');
-define('PATH_TO_TEST_DIR', dirname(__FILE__));
-
-$path = array(
-    PATH_TO_REAL_DIR,
-    PATH_TO_TEST_DIR,
-    PATH_TO_TEST_DIR . PATH_SEPARATOR . 'library',
-    PATH_TO_TINE_LIBRARY,
-    get_include_path(),
-);
-
-set_include_path(implode(PATH_SEPARATOR, $path));
-
-require_once 'bootstrap.php';
-
-// phpunit wants to handle the errors / report all errors + restore the default error handler
-error_reporting(E_ALL | E_STRICT);
-restore_error_handler();
-
-// disable sending cookies
-Zend_Session::setOptions(array(
-    'use_cookies'      => 0,
-    'use_only_cookies' => 0
-));

diff --git a/tests/tine20/TestCase.php b/tests/tine20/TestCase.php
index cfaa915..0e7c4fb 100644 (file)
--- a/tests/tine20/TestCase.php
+++ b/tests/tine20/TestCase.php
@@ -11,7 +11,7 @@
 /**
  * Test helper
  */
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 /**
  * Test class for Calendar_Backend_Sql

diff --git a/tests/tine20/TestHelper.php b/tests/tine20/TestHelper.php
index 9708a89..37c9c2a 100644 (file)
--- a/tests/tine20/TestHelper.php
+++ b/tests/tine20/TestHelper.php
@@ -9,40 +9,6 @@
  * @author      Matthias Greiling <m.greiling@metaways.de>
  */
 
-/*
- * Set include path
- */
- 
-define('PATH_TO_REAL_DIR', dirname(__FILE__). '/../../tine20');
-define('PATH_TO_TINE_LIBRARY', dirname(__FILE__). '/../../tine20/library');
-define('PATH_TO_TEST_DIR', dirname(__FILE__));
-
-$path = array(
-    PATH_TO_REAL_DIR,
-    PATH_TO_TEST_DIR,
-    PATH_TO_TEST_DIR . PATH_SEPARATOR . 'library',
-    PATH_TO_TINE_LIBRARY,
-    get_include_path(),
-);
-
-set_include_path(implode(PATH_SEPARATOR, $path));
-
-require_once 'bootstrap.php';
-
-// add test paths to autoloader
-$autoloader = require 'vendor/autoload.php';
-$autoloader->set('', $path);
-
-// phpunit wants to handle the errors / report all errors + restore the default error handler
-error_reporting(E_ALL | E_STRICT);
-restore_error_handler();
-
-// disable sending cookies
-Zend_Session::setOptions(array(
-    'use_cookies'      => 0,
-    'use_only_cookies' => 0
-));
-
 Tinebase_Session_Abstract::setSessionEnabled('TINE20SESSID');
 
 TestServer::getInstance()->initFramework();

diff --git a/tests/tine20/bootstrap.php b/tests/tine20/bootstrap.php
new file mode 100644 (file)
index 0000000..51968a6
--- /dev/null
+++ b/tests/tine20/bootstrap.php
@@ -0,0 +1,19 @@
+<?php
+require_once '../../tine20/bootstrap.php';
+
+// add path the local directory
+$autoloader->add('', array(__DIR__));
+
+define('PATH_TO_REAL_DIR', dirname(__FILE__). '/../../tine20');
+define('PATH_TO_TINE_LIBRARY', dirname(__FILE__). '/../../tine20/library');
+define('PATH_TO_TEST_DIR', dirname(__FILE__));
+
+// phpunit wants to handle the errors / report all errors + restore the default error handler
+error_reporting(E_ALL | E_STRICT);
+restore_error_handler();
+
+// disable sending cookies
+Zend_Session::setOptions(array(
+    'use_cookies'      => 0,
+    'use_only_cookies' => 0
+));

diff --git a/tests/tine20/phpunit.xml b/tests/tine20/phpunit.xml
index d00f7d1..e3707f1 100644 (file)
--- a/tests/tine20/phpunit.xml
+++ b/tests/tine20/phpunit.xml
@@ -5,7 +5,8 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false">
+         syntaxCheck="false"
+         bootstrap="bootstrap.php">
     <listeners>
         <listener class="LogListener" file="LogListener.php" />
     </listeners>

diff --git a/tine20/bootstrap.php b/tine20/bootstrap.php
index 9260c79..641e308 100644 (file)
--- a/tine20/bootstrap.php
+++ b/tine20/bootstrap.php
@@ -32,7 +32,7 @@ if (PHP_VERSION_ID > 50600) {
 }
 
 // intialize composers autoloader
-require 'vendor/autoload.php';
+$autoloader = require __DIR__ . '/vendor/autoload.php';
 
 // initialize plugins
 require 'init_plugins.php';

diff --git a/tine20/build.xml b/tine20/build.xml
index f7a6bbe..597cf6e 100644 (file)
--- a/tine20/build.xml
+++ b/tine20/build.xml
@@ -138,7 +138,7 @@
     <!-- ============================================      -->
     <target name="phpunit-exec" depends="clean, phpunit-prepare">
         <property name="testinclude" value="AllTests.php" override="true" />
-        <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}" override="true" />
+        <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}:${project.basedir}/library:${project.basedir}/library/zf1ext" override="true" />
         <property name="testadditionalparams" value="" override="true" />
         
         <echo msg="Starting Tests..." />
@@ -176,7 +176,6 @@
              -d include_path=${includepath}
              --configuration ${testconfigdir}/phpunit.xml
              --log-junit ${builddir}/reports/junit.xml
-             --bootstrap ServerTestHelper.php
              ${testadditionalparams}
              ${testinclude} " />
         </exec>

diff --git a/tine20/composer.json b/tine20/composer.json
index 7f07865..f388a8f 100644 (file)
--- a/tine20/composer.json
+++ b/tine20/composer.json
@@ -39,7 +39,7 @@
         "psr-0": {
             "": ["", "library"],
             "TimeZoneConvert": "library/TimeZoneConvert/lib/",
-            "Zend": ["", "library"],
+            "Zend": ["", "library", "library/zf1ext"],
             "qCal": "library/qCal/lib"
         },
         "classmap": [
@@ -47,5 +47,5 @@
         ]
     },
     "include-path-desc": "ZF1 still needs include path as it does not consequently use autoloading internally",
-    "include-path": ["", "library"]
+    "include-path": ["", "library", "library/zf1ext"]
 }

diff --git a/tine20/Zend/Auth/Adapter/Http/Abstract.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Http/Abstract.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Http/Abstract.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Http/Abstract.php

diff --git a/tine20/Zend/Auth/Adapter/Http/Ntlm.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Http/Ntlm.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm.php

diff --git a/tine20/Zend/Auth/Adapter/Http/Ntlm/Identity.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm/Identity.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Http/Ntlm/Identity.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm/Identity.php

diff --git a/tine20/Zend/Auth/Adapter/Http/Ntlm/Resolver/Interface.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm/Resolver/Interface.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Http/Ntlm/Resolver/Interface.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm/Resolver/Interface.php

diff --git a/tine20/Zend/Auth/Adapter/Http/Ntlm/Resolver/Mock.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm/Resolver/Mock.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Http/Ntlm/Resolver/Mock.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Http/Ntlm/Resolver/Mock.php

diff --git a/tine20/Zend/Auth/Adapter/Http/NtlmTests.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Http/NtlmTests.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Http/NtlmTests.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Http/NtlmTests.php

diff --git a/tine20/Zend/Auth/Adapter/Imap.php b/tine20/library/zf1ext/Zend/Auth/Adapter/Imap.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/Imap.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/Imap.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl/Certificate/Abstract.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Abstract.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl/Certificate/Abstract.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Abstract.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl/Certificate/Apache.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Apache.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl/Certificate/Apache.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Apache.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl/Certificate/Factory.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Factory.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl/Certificate/Factory.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Factory.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl/Certificate/ICPBrasil.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/ICPBrasil.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl/Certificate/ICPBrasil.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/ICPBrasil.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl/Certificate/Interface.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Interface.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl/Certificate/Interface.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/Interface.php

diff --git a/tine20/Zend/Auth/Adapter/ModSsl/Certificate/X509.php b/tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/X509.php
similarity index 100%
rename from tine20/Zend/Auth/Adapter/ModSsl/Certificate/X509.php
rename to tine20/library/zf1ext/Zend/Auth/Adapter/ModSsl/Certificate/X509.php

diff --git a/tine20/Zend/Cache/Backend/Redis.php b/tine20/library/zf1ext/Zend/Cache/Backend/Redis.php
similarity index 100%
rename from tine20/Zend/Cache/Backend/Redis.php
rename to tine20/library/zf1ext/Zend/Cache/Backend/Redis.php

diff --git a/tine20/Zend/Filter/Empty.php b/tine20/library/zf1ext/Zend/Filter/Empty.php
similarity index 100%
rename from tine20/Zend/Filter/Empty.php
rename to tine20/library/zf1ext/Zend/Filter/Empty.php

diff --git a/tine20/Zend/Json/Client.php b/tine20/library/zf1ext/Zend/Json/Client.php
similarity index 100%
rename from tine20/Zend/Json/Client.php
rename to tine20/library/zf1ext/Zend/Json/Client.php

diff --git a/tine20/Zend/Json/Client/Exception.php b/tine20/library/zf1ext/Zend/Json/Client/Exception.php
similarity index 100%
rename from tine20/Zend/Json/Client/Exception.php
rename to tine20/library/zf1ext/Zend/Json/Client/Exception.php

diff --git a/tine20/Zend/Json/Client/FaultException.php b/tine20/library/zf1ext/Zend/Json/Client/FaultException.php
similarity index 100%
rename from tine20/Zend/Json/Client/FaultException.php
rename to tine20/library/zf1ext/Zend/Json/Client/FaultException.php

diff --git a/tine20/Zend/Json/Client/HttpException.php b/tine20/library/zf1ext/Zend/Json/Client/HttpException.php
similarity index 100%
rename from tine20/Zend/Json/Client/HttpException.php
rename to tine20/library/zf1ext/Zend/Json/Client/HttpException.php

diff --git a/tine20/Zend/Json/Client/IntrospectException.php b/tine20/library/zf1ext/Zend/Json/Client/IntrospectException.php
similarity index 100%
rename from tine20/Zend/Json/Client/IntrospectException.php
rename to tine20/library/zf1ext/Zend/Json/Client/IntrospectException.php

diff --git a/tine20/Zend/Json/Client/Response.php b/tine20/library/zf1ext/Zend/Json/Client/Response.php
similarity index 100%
rename from tine20/Zend/Json/Client/Response.php
rename to tine20/library/zf1ext/Zend/Json/Client/Response.php

diff --git a/tine20/Zend/Json/Client/SMD.php b/tine20/library/zf1ext/Zend/Json/Client/SMD.php
similarity index 100%
rename from tine20/Zend/Json/Client/SMD.php
rename to tine20/library/zf1ext/Zend/Json/Client/SMD.php

diff --git a/tine20/Zend/Json/Client/ServerIntrospection.php b/tine20/library/zf1ext/Zend/Json/Client/ServerIntrospection.php
similarity index 100%
rename from tine20/Zend/Json/Client/ServerIntrospection.php
rename to tine20/library/zf1ext/Zend/Json/Client/ServerIntrospection.php

diff --git a/tine20/Zend/Json/Client/ServerProxy.php b/tine20/library/zf1ext/Zend/Json/Client/ServerProxy.php
similarity index 100%
rename from tine20/Zend/Json/Client/ServerProxy.php
rename to tine20/library/zf1ext/Zend/Json/Client/ServerProxy.php

diff --git a/tine20/Zend/Scheduler.php b/tine20/library/zf1ext/Zend/Scheduler.php
similarity index 100%
rename from tine20/Zend/Scheduler.php
rename to tine20/library/zf1ext/Zend/Scheduler.php

diff --git a/tine20/Zend/Scheduler/Backend/Abstract.php b/tine20/library/zf1ext/Zend/Scheduler/Backend/Abstract.php
similarity index 100%
rename from tine20/Zend/Scheduler/Backend/Abstract.php
rename to tine20/library/zf1ext/Zend/Scheduler/Backend/Abstract.php

diff --git a/tine20/Zend/Scheduler/Backend/Db.php b/tine20/library/zf1ext/Zend/Scheduler/Backend/Db.php
similarity index 100%
rename from tine20/Zend/Scheduler/Backend/Db.php
rename to tine20/library/zf1ext/Zend/Scheduler/Backend/Db.php

diff --git a/tine20/Zend/Scheduler/Backend/File.php b/tine20/library/zf1ext/Zend/Scheduler/Backend/File.php
similarity index 100%
rename from tine20/Zend/Scheduler/Backend/File.php
rename to tine20/library/zf1ext/Zend/Scheduler/Backend/File.php

diff --git a/tine20/Zend/Scheduler/Exception.php b/tine20/library/zf1ext/Zend/Scheduler/Exception.php
similarity index 100%
rename from tine20/Zend/Scheduler/Exception.php
rename to tine20/library/zf1ext/Zend/Scheduler/Exception.php

diff --git a/tine20/Zend/Scheduler/Task.php b/tine20/library/zf1ext/Zend/Scheduler/Task.php
similarity index 100%
rename from tine20/Zend/Scheduler/Task.php
rename to tine20/library/zf1ext/Zend/Scheduler/Task.php

diff --git a/tine20/Zend/Scheduler/Task/Interface.php b/tine20/library/zf1ext/Zend/Scheduler/Task/Interface.php
similarity index 100%
rename from tine20/Zend/Scheduler/Task/Interface.php
rename to tine20/library/zf1ext/Zend/Scheduler/Task/Interface.php

diff --git a/tine20/Zend/Scheduler/Task/Rule.php b/tine20/library/zf1ext/Zend/Scheduler/Task/Rule.php
similarity index 100%
rename from tine20/Zend/Scheduler/Task/Rule.php
rename to tine20/library/zf1ext/Zend/Scheduler/Task/Rule.php

diff --git a/tine20/Zend/Service/Nominatim.php b/tine20/library/zf1ext/Zend/Service/Nominatim.php
similarity index 100%
rename from tine20/Zend/Service/Nominatim.php
rename to tine20/library/zf1ext/Zend/Service/Nominatim.php

diff --git a/tine20/Zend/Service/Nominatim/Result.php b/tine20/library/zf1ext/Zend/Service/Nominatim/Result.php
similarity index 100%
rename from tine20/Zend/Service/Nominatim/Result.php
rename to tine20/library/zf1ext/Zend/Service/Nominatim/Result.php

diff --git a/tine20/Zend/Service/Nominatim/ResultSet.php b/tine20/library/zf1ext/Zend/Service/Nominatim/ResultSet.php
similarity index 100%
rename from tine20/Zend/Service/Nominatim/ResultSet.php
rename to tine20/library/zf1ext/Zend/Service/Nominatim/ResultSet.php

diff --git a/tine20/Zend/Service/Tine20.php b/tine20/library/zf1ext/Zend/Service/Tine20.php
similarity index 100%
rename from tine20/Zend/Service/Tine20.php
rename to tine20/library/zf1ext/Zend/Service/Tine20.php

diff --git a/tine20/Zend/Session/Validator/IpAddress.php b/tine20/library/zf1ext/Zend/Session/Validator/IpAddress.php
similarity index 100%
rename from tine20/Zend/Session/Validator/IpAddress.php
rename to tine20/library/zf1ext/Zend/Session/Validator/IpAddress.php