Fix joomla 3.5.0 loaders

JBZoo-CCK · Mar 28, 2016 · 3672d29 · 3672d29
1 parent abbf034
commit 3672d29
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,7 +53,6 @@ script:
   - composer phpunit-wordpress
 
   - composer prepare-joomla
-  - cat ./resources/joomla/configuration.php
   - composer phpunit-joomla
 
   # Other tests

diff --git a/tests/autoload/cms-joomla.php b/tests/autoload/cms-joomla.php
@@ -17,7 +17,6 @@
 define('JPATH_BASE', CMS_PATH_JOOMLA);
 
 require_once JPATH_BASE . '/includes/defines.php';
-require_once JPATH_LIBRARIES . '/import.legacy.php';
-require_once JPATH_LIBRARIES . '/cms.php';
+require_once JPATH_BASE . '/includes/framework.php';
 
 JFactory::getApplication('site');
diff --git a/tests/extentions/joomla-plugin/jbzoophpunit.php b/tests/extentions/joomla-plugin/jbzoophpunit.php
@@ -34,7 +34,10 @@ class PlgSystemJBZooPHPUnit extends JPlugin
     public function onAfterInitialise()
     {
         if (!class_exists('\JBZoo\CrossCMS\Cms')) {
-            if ($autoloadPath = realpath('../../vendor/autoload.php')) {
+            if ($autoloadPath = realpath('./../../vendor/autoload.php')) {
+                require_once $autoloadPath;
+            }
+            if ($autoloadPath = realpath('./../../../vendor/autoload.php')) {
                 require_once $autoloadPath;
             }
         }