diff --git a/composer.json b/composer.json deleted file mode 100644 index 0f29d14adb..0000000000 --- a/composer.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "repositories": { - "PHPmailer": { - "vcs": { - "url": "git://github.com/alchemy-fr/PHPMailer_v5.1.git" - } - }, - "exiftool": { - "vcs": { - "url": "git://github.com/alchemy-fr/exiftool.git" - } - }, - "fpdf": { - "vcs": { - "url": "git://github.com/alchemy-fr/fpdf.git" - } - }, - "gdata": { - "vcs": { - "url": "git://github.com/alchemy-fr/gdata.git" - } - }, - "moov": { - "vcs": { - "url": "git://github.com/alchemy-fr/MoovRelocator.git" - } - }, - "oauth2": { - "vcs": { - "url": "git://github.com/alchemy-fr/oauth2-php.git" - } - }, - "Phlickr": { - "vcs": { - "url": "git://github.com/alchemy-fr/Phlickr.git" - } - }, - "PHPShortener": { - "vcs": { - "url": "git://github.com/alchemy-fr/PHPShortener.git" - } - }, - "recaptcha": { - "vcs": { - "url": "git://github.com/alchemy-fr/recaptcha.git" - } - }, - "tcpdf": { - "vcs": { - "url": "git://github.com/alchemy-fr/tcpdf.git" - } - }, - "SphinxSearch": { - "vcs": { - "url": "git://github.com/alchemy-fr/SphinxSearch-PHP-SDK.git" - } - }, - "DailymotionSDK" : { - "vcs": { - "url": "git://github.com/romainneutron/dailymotion-sdk-php.git" - } - } - }, - "require": { - "alchemy/phpmailer": "master", - "alchemy/exiftool": "master", - "alchemy/fpdf": "master", - "alchemy/gdata": "master", - "alchemy/moovrelocator": "master", - "alchemy/oauth2php": "master", - "alchemy/phlickr": "master", - "alchemy/phpshortener": "master", - "alchemy/recaptcha": "master", - "alchemy/tcpdf": "master", - "alchemy/sphinxsearch": "master", - "doctrine/orm": "2.1.*", - "doctrine/data-fixtures": "master-dev", - "gedmo/doctrine-extensions": "master-dev", - "dailymotion/sdk" : "master", - "silex/silex": "1.0.*", - "symfony/yaml": "2.1.*", - "symfony/console": "2.1.*", - "symfony/serializer": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "monolog/monolog": "1.0.*", - "twig/twig": "1.5.*", - "twig/extensions": "master-dev" - } -} diff --git a/lib/Alchemy/Phrasea/Core.php b/lib/Alchemy/Phrasea/Core.php index ba00b707fc..85df5e9a73 100644 --- a/lib/Alchemy/Phrasea/Core.php +++ b/lib/Alchemy/Phrasea/Core.php @@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\Request, Symfony\Component\Serializer; use Alchemy\Phrasea\Core\Configuration; -require_once __DIR__ . '/../../../vendor/.composer/autoload.php'; +require_once __DIR__ . '/../../vendor/Silex/vendor/pimple/lib/Pimple.php'; /** * @@ -374,8 +374,12 @@ class Core extends \Pimple */ public static function initAutoloads() { - require_once __DIR__ . '/../../../vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php'; + require_once __DIR__ . '/../../vendor/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php'; + require_once __DIR__ . '/../../vendor/Twig/lib/Twig/Autoloader.php'; + require_once __DIR__ . '/../../vendor/Twig-extensions/lib/Twig/Extensions/Autoloader.php'; + + \Twig_Autoloader::register(); \Twig_Extensions_Autoloader::register(); $loader = new \Symfony\Component\ClassLoader\UniversalClassLoader(); @@ -384,10 +388,16 @@ class Core extends \Pimple $loader->registerNamespaces(array( 'Alchemy' => __DIR__ . '/../..', + 'Symfony\\Component\\Yaml' => __DIR__ . '/../../vendor/symfony/src', + 'Symfony\\Component\\Console' => __DIR__ . '/../../vendor/symfony/src', + 'Symfony\\Component\\Serializer' => __DIR__ . '/../../vendor/symfony/src', + 'Symfony\\Component\\DependencyInjection' => __DIR__ . '/../../vendor/symfony/src', )); $loader->register(); + require_once __DIR__ . '/../../vendor/Silex/autoload.php'; + return; } diff --git a/lib/Alchemy/Phrasea/Core/Service/Doctrine.php b/lib/Alchemy/Phrasea/Core/Service/Doctrine.php index 4b39a232ed..93b8a47d28 100644 --- a/lib/Alchemy/Phrasea/Core/Service/Doctrine.php +++ b/lib/Alchemy/Phrasea/Core/Service/Doctrine.php @@ -30,6 +30,8 @@ class Doctrine public function __construct(Array $doctrineConfiguration = array()) { + require_once __DIR__ . '/../../../../vendor/doctrine2-orm/lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php'; + static::loadClasses(); $config = new \Doctrine\ORM\Configuration(); @@ -118,13 +120,13 @@ class Doctrine $classLoader = new \Doctrine\Common\ClassLoader( 'Doctrine\ORM' - , realpath(__DIR__ . '/../../../../../vendor/doctrine/orm/lib') + , realpath(__DIR__ . '/../../../../vendor/doctrine2-orm/lib') ); $classLoader->register(); $classLoader = new \Doctrine\Common\ClassLoader( 'Doctrine\DBAL' - , realpath(__DIR__ . '/../../../../../vendor/doctrine/orm/lib/vendor/doctrine-dbal/lib') + , realpath(__DIR__ . '/../../../../vendor/doctrine2-orm/lib/vendor/doctrine-dbal/lib') ); $classLoader->register(); @@ -142,7 +144,7 @@ class Doctrine $classLoader = new \Doctrine\Common\ClassLoader( 'Doctrine\Common' - , realpath(__DIR__ . '/../../../../../vendor/doctrine/orm/lib/vendor/doctrine-common/lib') + , realpath(__DIR__ . '/../../../../vendor/doctrine2-orm/lib/vendor/doctrine-common/lib') ); $classLoader->register(); @@ -166,7 +168,7 @@ class Doctrine $classLoader = new \Doctrine\Common\ClassLoader( 'Symfony' - , realpath(__DIR__ . '/../../../../../vendor/doctrine/orm/lib/vendor') + , realpath(__DIR__ . '/../../../../vendor/doctrine2-orm/lib/vendor') ); $classLoader->register(); @@ -194,7 +196,7 @@ class Doctrine $classLoader = new \Doctrine\Common\ClassLoader( 'Gedmo' - , __DIR__ . "/../../../../../vendor/gedmo/doctrine-extensions/lib" + , __DIR__ . "/../../../../vendor/doctrine2-gedmo/lib" ); $classLoader->register(); diff --git a/lib/classes/Bridge/Api/Auth/Flickr.class.php b/lib/classes/Bridge/Api/Auth/Flickr.class.php index 8b551c981c..a19310e446 100644 --- a/lib/classes/Bridge/Api/Auth/Flickr.class.php +++ b/lib/classes/Bridge/Api/Auth/Flickr.class.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -$new_include_path = __DIR__ . "/../../../../../vendor/" . PATH_SEPARATOR . get_include_path(); +$new_include_path = __DIR__ . "/../../../../vendor/" . PATH_SEPARATOR . get_include_path(); set_include_path($new_include_path); /** diff --git a/lib/classes/DailymotionWithoutOauth2.php b/lib/classes/DailymotionWithoutOauth2.php index 6ef39898fb..007ffd0665 100644 --- a/lib/classes/DailymotionWithoutOauth2.php +++ b/lib/classes/DailymotionWithoutOauth2.php @@ -10,7 +10,7 @@ * * @author nicolas */ -require_once __DIR__ . '/../../vendor/dailymotion/sdk/Dailymotion.php'; +require_once __DIR__ . '/../vendor/dailymotion-sdk-php/Dailymotion.php'; class DailymotionWithoutOauth2 extends Dailymotion { diff --git a/lib/classes/patch/320aa.class.php b/lib/classes/patch/320aa.class.php index 72596d7a32..5468abc4d5 100644 --- a/lib/classes/patch/320aa.class.php +++ b/lib/classes/patch/320aa.class.php @@ -85,7 +85,7 @@ class patch_320aa implements patchInterface if($datas['name'] == 'GV_exiftool' && strpos($val, 'lib/exiftool/exiftool') !== false) { - $val = str_replace('lib/exiftool/exiftool', 'vendor/alchemy/exiftool/exiftool', $val); + $val = str_replace('lib/exiftool/exiftool', 'lib/vendor/exiftool/exiftool', $val); } switch ($datas['type']) diff --git a/lib/classes/setup.class.php b/lib/classes/setup.class.php index ad832a431e..3a22c14349 100644 --- a/lib/classes/setup.class.php +++ b/lib/classes/setup.class.php @@ -264,12 +264,12 @@ class setup { if (system_server::get_platform() == 'WINDOWS') { - $exiftool = dirname(__DIR__) . '/../vendor/alchemy/exiftool/exiftool.exe'; + $exiftool = dirname(__DIR__) . '/vendor/exiftool/exiftool.exe'; $indexer = dirname(dirname(__DIR__)) . '/bin/phraseanet_indexer.exe'; } else { - $exiftool = dirname(__DIR__) . '/../vendor/alchemy/exiftool/exiftool'; + $exiftool = dirname(__DIR__) . '/vendor/exiftool/exiftool'; $indexer = null; } diff --git a/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php b/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php index 818177c835..edb3a79d85 100644 --- a/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php +++ b/lib/unitTest/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc'; require_once dirname(__FILE__) . '/../../Bridge_datas.inc'; -$new_include_path = dirname(__FILE__) . '/../../../../../vendor/alchemy/gdata/' . PATH_SEPARATOR . get_include_path(); +$new_include_path = dirname(__FILE__) . '/../../../../vendor/gdata/' . PATH_SEPARATOR . get_include_path(); set_include_path($new_include_path); diff --git a/lib/unitTest/api/oauthv2/applicationTest.php b/lib/unitTest/api/oauthv2/applicationTest.php index b50686d855..a8d56fb7bf 100644 --- a/lib/unitTest/api/oauthv2/applicationTest.php +++ b/lib/unitTest/api/oauthv2/applicationTest.php @@ -1,6 +1,7 @@