diff --git a/bin/console b/bin/console
index b1e49cb105..65e5b85000 100755
--- a/bin/console
+++ b/bin/console
@@ -24,7 +24,7 @@ use Alchemy\Phrasea\Command\RecordAdd;
use Alchemy\Phrasea\Command\CreateCollection;
use Alchemy\Phrasea\CLI;
-require_once dirname(__FILE__) . '/../lib/bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
try {
$app = new CLI("
diff --git a/bin/doctrine b/bin/doctrine
index dcf1664884..83f4511b84 100755
--- a/bin/doctrine
+++ b/bin/doctrine
@@ -31,7 +31,7 @@ use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand;
use Doctrine\ORM\Tools\Console\Command\RunDqlCommand;
use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
-require_once dirname(__FILE__) . '/../lib/bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
try {
$cli = new CLI("Phraseanet Doctrine Console");
diff --git a/bin/setup b/bin/setup
index e58135ad5b..b43d1fae58 100755
--- a/bin/setup
+++ b/bin/setup
@@ -21,7 +21,7 @@ use Alchemy\Phrasea\Command\UpgradeDBDatas;
use Alchemy\Phrasea\Command\Setup\Install;
use Alchemy\Phrasea\CLI;
-require_once dirname(__FILE__) . '/../lib/bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
try {
$app = new CLI("
diff --git a/builder.php b/builder.php
index 7c501862d2..2c0492df4b 100755
--- a/builder.php
+++ b/builder.php
@@ -5,15 +5,15 @@
*
*/
+use Symfony\Component\Finder\Finder;
+
+require __DIR__ . '/vendor/autoload.php';
+
printf('Retrieve vendors ...' . PHP_EOL);
system('./vendors.php --no-dev');
-require_once __DIR__ . '/lib/classes/bootstrap.class.php';
-
-\bootstrap::register_autoloads();
-
-use Symfony\Component\Finder\Finder;
+system(__DIR__ . '/composer.phar dump-autoload');
chdir(__DIR__);
diff --git a/cleaner.php b/cleaner.php
index 316453070c..1941a5737c 100755
--- a/cleaner.php
+++ b/cleaner.php
@@ -5,12 +5,10 @@
*
*/
-require_once __DIR__ . '/lib/classes/bootstrap.class.php';
-
-\bootstrap::register_autoloads();
-
use Symfony\Component\Finder\Finder;
+require __DIR__ . '/vendor/autoload.php';
+
chdir(__DIR__);
set_time_limit(0);
diff --git a/composer.json b/composer.json
index 96ee5e6f35..b8dcf6a579 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,15 @@
],
"autoload": {
"psr-0": {
- "Alchemy": "lib"
+ "": "lib/classes",
+ "Alchemy": "lib",
+ "Doctrine": "lib",
+ "Entities": "lib/Doctrine",
+ "Types": "lib/Doctrine",
+ "Repositories": "lib/Doctrine",
+ "Proxies": "lib/Doctrine",
+ "PhraseaFixture": "lib/conf.d"
}
- }
+ },
+ "include-path": ["vendor/zend/gdata/library"]
}
diff --git a/functionnal-tests/api/dailymotion.php b/functionnal-tests/api/dailymotion.php
index 4a7339a745..084c46eb2d 100644
--- a/functionnal-tests/api/dailymotion.php
+++ b/functionnal-tests/api/dailymotion.php
@@ -1,17 +1,12 @@
writeln('could not parse configuration file');
return;
}
-
-
+
+
$appbox = \appbox::get_instance($core);
-
+
$found = false;
foreach ($appbox->get_databoxes() as $databox) {
/* @var $databox \databox */
@@ -44,16 +39,16 @@ $console
}
unset($stmt);
}
-
+
if (!$found) {
$output->writeln('No video found, ');
return;
}
-
+
$bridge = new \Bridge_Api_Dailymotion($core['Registry'], new \Bridge_Api_Auth_OAuth2());
-
+
$bridge->set_oauth_token($configuration['dailymotion']['dev_token']);
-
+
$options = array();
$samples = array(
'title' => $record->get_title(),
@@ -61,11 +56,11 @@ $console
'tags' => 'phraseanet upload test dm api',
'private' => true,
);
-
+
foreach($bridge->get_fields() as $field) {
- $options[$field['name']] = isset($samples[$field['name']]) ? $samples[$field['name']] : uniqid('test_upload');
+ $options[$field['name']] = isset($samples[$field['name']]) ? $samples[$field['name']] : uniqid('test_upload');
}
-
+
try {
$idVideo = $bridge->upload($record, $options);
$output->writeln(sprintf('video id is %s', $idVideo));
diff --git a/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php b/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
index ea13abb98b..7378ecabe8 100644
--- a/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
+++ b/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
@@ -30,8 +30,7 @@ class ConnectionTest implements ControllerProviderInterface
* @todo : check this as it would lead to a security issue
*/
$controllers->get('/mysql/', function(Application $app) {
- require_once __DIR__ . '/../../../../classes/connection/pdo.class.php';
-
+
$request = $app['request'];
$hostname = $request->query->get('hostname', '127.0.0.1');
$port = (int) $request->query->get('port', 3306);
diff --git a/lib/Alchemy/Phrasea/Loader/ApcAutoloader.php b/lib/Alchemy/Phrasea/Loader/ApcAutoloader.php
deleted file mode 100644
index e5dc838526..0000000000
--- a/lib/Alchemy/Phrasea/Loader/ApcAutoloader.php
+++ /dev/null
@@ -1,37 +0,0 @@
-paths['config'] = __DIR__ . '/../../../../config/classes/';
- $this->paths['library'] = __DIR__ . '/../../../classes/';
-
- $getComposerClassMap = function() {
- return require realpath(__DIR__ . '/../../../../vendor/composer/autoload_classmap.php');
- };
-
- $this->classmap = $getComposerClassMap();
- }
-
- /**
- * {@inheritdoc}
- */
- public function findFile($class)
- {
- if ( ! $file = $this->checkFile($class)) {
- $file = parent::findFile($class);
- }
-
- return $file;
- }
-
- /**
- * Add a path to look for autoloading phraseanet classes
- * @param string $name
- * @param string $path
- */
- public function addPath($name, $path)
- {
- $this->paths[$name] = \p4string::addEndSlash($path);
- }
-
- /**
- * Check whether a class with $class name exists
- * foreach declared paths
- * @param string $class
- * @return mixed string|null
- */
- private function checkFile($classname)
- {
- if (isset($this->classmap[$classname])) {
- return $this->classmap[$classname];
- }
-
- $normalized_classname = str_replace('_', '/', $classname);
-
- foreach ($this->paths as $path) {
- $file = $path . $normalized_classname . '.class.php';
-
- if (file_exists($file)) {
- return $file;
- }
- }
- }
-
- /**
- * Get Paths where classes are checked for autoloading
- * @return Array
- */
- public function getPaths()
- {
- return $this->paths;
- }
-}
diff --git a/lib/Alchemy/Phrasea/Loader/CacheAutoloader.php b/lib/Alchemy/Phrasea/Loader/CacheAutoloader.php
deleted file mode 100644
index be8d5e9172..0000000000
--- a/lib/Alchemy/Phrasea/Loader/CacheAutoloader.php
+++ /dev/null
@@ -1,128 +0,0 @@
-prefix = $prefix;
-
- foreach ($this->cacheAdapters as $className) {
- $file = sprintf("%s/%sAutoloader.php", __DIR__, $className);
-
- if ( ! file_exists($file)) {
- continue;
- }
-
- require_once $file;
-
- $className = sprintf("\Alchemy\Phrasea\Loader\%sAutoloader", $className);
-
- if ( ! class_exists($className)) {
- continue;
- }
-
- $method = new $className();
-
- if ($namespace) {
- $method->setNamespace($namespace);
- }
-
- if ($method instanceof LoaderStrategy && $method->isAvailable()) {
- $this->cacheAdapter = $method;
- break;
- }
- }
-
- if (null === $this->cacheAdapter) {
- throw new \Exception('No Cache available');
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function findFile($class)
- {
- $file = $this->cacheAdapter->fetch($this->prefix . $class);
-
- if (false === $file) {
- $this->cacheAdapter->save($this->prefix . $class, $file = parent::findFile($class));
- }
-
- return $file;
- }
-
- /**
- * {@inheritdoc}
- */
- public function register($prepend = false)
- {
- spl_autoload_register(array($this, 'loadClass'), true, $prepend);
- }
-
- /**
- * Get the current cache Adapter
- * @return LoaderStrategy
- */
- public function getAdapter()
- {
- return $this->cacheAdapter;
- }
-
- /**
- * Get the identifier cache key prefix
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
-}
diff --git a/lib/Alchemy/Phrasea/Loader/LoaderStrategy.php b/lib/Alchemy/Phrasea/Loader/LoaderStrategy.php
deleted file mode 100644
index ed7b3d115d..0000000000
--- a/lib/Alchemy/Phrasea/Loader/LoaderStrategy.php
+++ /dev/null
@@ -1,27 +0,0 @@
- $path) {
- if (substr($prefix, -1) === '_' || $prefix == 'Pimple') {
- $loader->registerPrefix($prefix, $path);
- } else {
- $loader->registerNamespace($prefix, $path);
- }
- }
-
- $loader->registerNamespaces(array(
- 'Entities' => realpath(__DIR__ . '/../Doctrine/'),
- 'Repositories' => realpath(__DIR__ . '/../Doctrine/'),
- 'Proxies' => realpath(__DIR__ . '/../Doctrine/'),
- 'Doctrine\\Logger' => realpath(__DIR__ . '/../'),
- 'Types' => realpath(__DIR__ . "/../Doctrine"),
- 'PhraseaFixture' => realpath(__DIR__ . "/../conf.d"),
- ));
-
- $loader->register();
-
- set_include_path(
- get_include_path() . PATH_SEPARATOR . realpath(__DIR__ . '/../../vendor/zend/gdata/library')
- );
-
- static::$autoloader_initialized = true;
-
- return;
- }
-}
diff --git a/lib/classes/cache/cacheableInterface.class.php b/lib/classes/cache/cacheableInterface.php
similarity index 100%
rename from lib/classes/cache/cacheableInterface.class.php
rename to lib/classes/cache/cacheableInterface.php
diff --git a/lib/classes/cache/databox.class.php b/lib/classes/cache/databox.php
similarity index 100%
rename from lib/classes/cache/databox.class.php
rename to lib/classes/cache/databox.php
diff --git a/lib/classes/caption/Field/Value.class.php b/lib/classes/caption/Field/Value.php
similarity index 100%
rename from lib/classes/caption/Field/Value.class.php
rename to lib/classes/caption/Field/Value.php
diff --git a/lib/classes/caption/field.class.php b/lib/classes/caption/field.php
similarity index 100%
rename from lib/classes/caption/field.class.php
rename to lib/classes/caption/field.php
diff --git a/lib/classes/caption/interface.class.php b/lib/classes/caption/interface.php
similarity index 100%
rename from lib/classes/caption/interface.class.php
rename to lib/classes/caption/interface.php
diff --git a/lib/classes/caption/record.class.php b/lib/classes/caption/record.php
similarity index 100%
rename from lib/classes/caption/record.class.php
rename to lib/classes/caption/record.php
diff --git a/lib/classes/collection.class.php b/lib/classes/collection.php
similarity index 100%
rename from lib/classes/collection.class.php
rename to lib/classes/collection.php
diff --git a/lib/classes/connection.class.php b/lib/classes/connection.php
similarity index 100%
rename from lib/classes/connection.class.php
rename to lib/classes/connection.php
diff --git a/lib/classes/connection/abstract.class.php b/lib/classes/connection/abstract.php
similarity index 100%
rename from lib/classes/connection/abstract.class.php
rename to lib/classes/connection/abstract.php
diff --git a/lib/classes/connection/interface.class.php b/lib/classes/connection/interface.php
similarity index 100%
rename from lib/classes/connection/interface.class.php
rename to lib/classes/connection/interface.php
diff --git a/lib/classes/connection/pdo.class.php b/lib/classes/connection/pdo.php
similarity index 100%
rename from lib/classes/connection/pdo.class.php
rename to lib/classes/connection/pdo.php
diff --git a/lib/classes/connection/pdoStatementDebugger.class.php b/lib/classes/connection/pdoStatementDebugger.php
similarity index 100%
rename from lib/classes/connection/pdoStatementDebugger.class.php
rename to lib/classes/connection/pdoStatementDebugger.php
diff --git a/lib/classes/databox.class.php b/lib/classes/databox.php
similarity index 100%
rename from lib/classes/databox.class.php
rename to lib/classes/databox.php
diff --git a/lib/classes/databox/Field/DCES/Contributor.class.php b/lib/classes/databox/Field/DCES/Contributor.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Contributor.class.php
rename to lib/classes/databox/Field/DCES/Contributor.php
diff --git a/lib/classes/databox/Field/DCES/Coverage.class.php b/lib/classes/databox/Field/DCES/Coverage.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Coverage.class.php
rename to lib/classes/databox/Field/DCES/Coverage.php
diff --git a/lib/classes/databox/Field/DCES/Creator.class.php b/lib/classes/databox/Field/DCES/Creator.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Creator.class.php
rename to lib/classes/databox/Field/DCES/Creator.php
diff --git a/lib/classes/databox/Field/DCES/Date.class.php b/lib/classes/databox/Field/DCES/Date.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Date.class.php
rename to lib/classes/databox/Field/DCES/Date.php
diff --git a/lib/classes/databox/Field/DCES/Description.class.php b/lib/classes/databox/Field/DCES/Description.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Description.class.php
rename to lib/classes/databox/Field/DCES/Description.php
diff --git a/lib/classes/databox/Field/DCES/Format.class.php b/lib/classes/databox/Field/DCES/Format.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Format.class.php
rename to lib/classes/databox/Field/DCES/Format.php
diff --git a/lib/classes/databox/Field/DCES/Identifier.class.php b/lib/classes/databox/Field/DCES/Identifier.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Identifier.class.php
rename to lib/classes/databox/Field/DCES/Identifier.php
diff --git a/lib/classes/databox/Field/DCES/Language.class.php b/lib/classes/databox/Field/DCES/Language.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Language.class.php
rename to lib/classes/databox/Field/DCES/Language.php
diff --git a/lib/classes/databox/Field/DCES/Publisher.class.php b/lib/classes/databox/Field/DCES/Publisher.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Publisher.class.php
rename to lib/classes/databox/Field/DCES/Publisher.php
diff --git a/lib/classes/databox/Field/DCES/Relation.class.php b/lib/classes/databox/Field/DCES/Relation.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Relation.class.php
rename to lib/classes/databox/Field/DCES/Relation.php
diff --git a/lib/classes/databox/Field/DCES/Rights.class.php b/lib/classes/databox/Field/DCES/Rights.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Rights.class.php
rename to lib/classes/databox/Field/DCES/Rights.php
diff --git a/lib/classes/databox/Field/DCES/Source.class.php b/lib/classes/databox/Field/DCES/Source.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Source.class.php
rename to lib/classes/databox/Field/DCES/Source.php
diff --git a/lib/classes/databox/Field/DCES/Subject.class.php b/lib/classes/databox/Field/DCES/Subject.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Subject.class.php
rename to lib/classes/databox/Field/DCES/Subject.php
diff --git a/lib/classes/databox/Field/DCES/Title.class.php b/lib/classes/databox/Field/DCES/Title.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Title.class.php
rename to lib/classes/databox/Field/DCES/Title.php
diff --git a/lib/classes/databox/Field/DCES/Type.class.php b/lib/classes/databox/Field/DCES/Type.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Type.class.php
rename to lib/classes/databox/Field/DCES/Type.php
diff --git a/lib/classes/databox/Field/DCESAbstract.class.php b/lib/classes/databox/Field/DCESAbstract.php
similarity index 100%
rename from lib/classes/databox/Field/DCESAbstract.class.php
rename to lib/classes/databox/Field/DCESAbstract.php
diff --git a/lib/classes/databox/cgu.class.php b/lib/classes/databox/cgu.php
similarity index 100%
rename from lib/classes/databox/cgu.class.php
rename to lib/classes/databox/cgu.php
diff --git a/lib/classes/databox/descriptionStructure.class.php b/lib/classes/databox/descriptionStructure.php
similarity index 100%
rename from lib/classes/databox/descriptionStructure.class.php
rename to lib/classes/databox/descriptionStructure.php
diff --git a/lib/classes/databox/field.class.php b/lib/classes/databox/field.php
similarity index 100%
rename from lib/classes/databox/field.class.php
rename to lib/classes/databox/field.php
diff --git a/lib/classes/databox/status.class.php b/lib/classes/databox/status.php
similarity index 100%
rename from lib/classes/databox/status.class.php
rename to lib/classes/databox/status.php
diff --git a/lib/classes/databox/subdef.class.php b/lib/classes/databox/subdef.php
similarity index 100%
rename from lib/classes/databox/subdef.class.php
rename to lib/classes/databox/subdef.php
diff --git a/lib/classes/databox/subdefsStructure.class.php b/lib/classes/databox/subdefsStructure.php
similarity index 100%
rename from lib/classes/databox/subdefsStructure.class.php
rename to lib/classes/databox/subdefsStructure.php
diff --git a/lib/classes/eventsmanager/broker.class.php b/lib/classes/eventsmanager/broker.php
similarity index 100%
rename from lib/classes/eventsmanager/broker.class.php
rename to lib/classes/eventsmanager/broker.php
diff --git a/lib/classes/eventsmanager/event/test.class.php b/lib/classes/eventsmanager/event/test.php
similarity index 100%
rename from lib/classes/eventsmanager/event/test.class.php
rename to lib/classes/eventsmanager/event/test.php
diff --git a/lib/classes/eventsmanager/eventAbstract.class.php b/lib/classes/eventsmanager/eventAbstract.php
similarity index 100%
rename from lib/classes/eventsmanager/eventAbstract.class.php
rename to lib/classes/eventsmanager/eventAbstract.php
diff --git a/lib/classes/eventsmanager/notify/autoregister.class.php b/lib/classes/eventsmanager/notify/autoregister.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/autoregister.class.php
rename to lib/classes/eventsmanager/notify/autoregister.php
diff --git a/lib/classes/eventsmanager/notify/bridgeuploadfail.class.php b/lib/classes/eventsmanager/notify/bridgeuploadfail.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/bridgeuploadfail.class.php
rename to lib/classes/eventsmanager/notify/bridgeuploadfail.php
diff --git a/lib/classes/eventsmanager/notify/downloadmailfail.class.php b/lib/classes/eventsmanager/notify/downloadmailfail.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/downloadmailfail.class.php
rename to lib/classes/eventsmanager/notify/downloadmailfail.php
diff --git a/lib/classes/eventsmanager/notify/feed.class.php b/lib/classes/eventsmanager/notify/feed.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/feed.class.php
rename to lib/classes/eventsmanager/notify/feed.php
diff --git a/lib/classes/eventsmanager/notify/order.class.php b/lib/classes/eventsmanager/notify/order.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/order.class.php
rename to lib/classes/eventsmanager/notify/order.php
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.class.php b/lib/classes/eventsmanager/notify/orderdeliver.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/orderdeliver.class.php
rename to lib/classes/eventsmanager/notify/orderdeliver.php
diff --git a/lib/classes/eventsmanager/notify/ordernotdelivered.class.php b/lib/classes/eventsmanager/notify/ordernotdelivered.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/ordernotdelivered.class.php
rename to lib/classes/eventsmanager/notify/ordernotdelivered.php
diff --git a/lib/classes/eventsmanager/notify/push.class.php b/lib/classes/eventsmanager/notify/push.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/push.class.php
rename to lib/classes/eventsmanager/notify/push.php
diff --git a/lib/classes/eventsmanager/notify/register.class.php b/lib/classes/eventsmanager/notify/register.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/register.class.php
rename to lib/classes/eventsmanager/notify/register.php
diff --git a/lib/classes/eventsmanager/notify/uploadquarantine.class.php b/lib/classes/eventsmanager/notify/uploadquarantine.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/uploadquarantine.class.php
rename to lib/classes/eventsmanager/notify/uploadquarantine.php
diff --git a/lib/classes/eventsmanager/notify/validate.class.php b/lib/classes/eventsmanager/notify/validate.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/validate.class.php
rename to lib/classes/eventsmanager/notify/validate.php
diff --git a/lib/classes/eventsmanager/notify/validationdone.class.php b/lib/classes/eventsmanager/notify/validationdone.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/validationdone.class.php
rename to lib/classes/eventsmanager/notify/validationdone.php
diff --git a/lib/classes/eventsmanager/notify/validationreminder.class.php b/lib/classes/eventsmanager/notify/validationreminder.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/validationreminder.class.php
rename to lib/classes/eventsmanager/notify/validationreminder.php
diff --git a/lib/classes/eventsmanager/notifyAbstract.class.php b/lib/classes/eventsmanager/notifyAbstract.php
similarity index 100%
rename from lib/classes/eventsmanager/notifyAbstract.class.php
rename to lib/classes/eventsmanager/notifyAbstract.php
diff --git a/lib/classes/format.class.php b/lib/classes/format.php
similarity index 100%
rename from lib/classes/format.class.php
rename to lib/classes/format.php
diff --git a/lib/classes/ftpclient.class.php b/lib/classes/ftpclient.php
similarity index 100%
rename from lib/classes/ftpclient.class.php
rename to lib/classes/ftpclient.php
diff --git a/lib/classes/gatekeeper.class.php b/lib/classes/gatekeeper.php
similarity index 100%
rename from lib/classes/gatekeeper.class.php
rename to lib/classes/gatekeeper.php
diff --git a/lib/classes/geonames.class.php b/lib/classes/geonames.php
similarity index 100%
rename from lib/classes/geonames.class.php
rename to lib/classes/geonames.php
diff --git a/lib/classes/http/query.class.php b/lib/classes/http/query.php
similarity index 100%
rename from lib/classes/http/query.class.php
rename to lib/classes/http/query.php
diff --git a/lib/classes/http/request.class.php b/lib/classes/http/request.php
similarity index 100%
rename from lib/classes/http/request.class.php
rename to lib/classes/http/request.php
diff --git a/lib/classes/liste.class.php b/lib/classes/liste.php
similarity index 100%
rename from lib/classes/liste.class.php
rename to lib/classes/liste.php
diff --git a/lib/classes/login.class.php b/lib/classes/login.php
similarity index 100%
rename from lib/classes/login.class.php
rename to lib/classes/login.php
diff --git a/lib/classes/mail.class.php b/lib/classes/mail.php
similarity index 100%
rename from lib/classes/mail.class.php
rename to lib/classes/mail.php
diff --git a/lib/classes/media/Permalink/Adapter.class.php b/lib/classes/media/Permalink/Adapter.php
similarity index 100%
rename from lib/classes/media/Permalink/Adapter.class.php
rename to lib/classes/media/Permalink/Adapter.php
diff --git a/lib/classes/media/Permalink/Interface.class.php b/lib/classes/media/Permalink/Interface.php
similarity index 100%
rename from lib/classes/media/Permalink/Interface.class.php
rename to lib/classes/media/Permalink/Interface.php
diff --git a/lib/classes/media/abstract.class.php b/lib/classes/media/abstract.php
similarity index 100%
rename from lib/classes/media/abstract.class.php
rename to lib/classes/media/abstract.php
diff --git a/lib/classes/media/adapter.class.php b/lib/classes/media/adapter.php
similarity index 100%
rename from lib/classes/media/adapter.class.php
rename to lib/classes/media/adapter.php
diff --git a/lib/classes/media/subdef.class.php b/lib/classes/media/subdef.php
similarity index 100%
rename from lib/classes/media/subdef.class.php
rename to lib/classes/media/subdef.php
diff --git a/lib/classes/module/client.class.php b/lib/classes/module/client.php
similarity index 100%
rename from lib/classes/module/client.class.php
rename to lib/classes/module/client.php
diff --git a/lib/classes/module/console/aboutAuthors.class.php b/lib/classes/module/console/aboutAuthors.php
similarity index 100%
rename from lib/classes/module/console/aboutAuthors.class.php
rename to lib/classes/module/console/aboutAuthors.php
diff --git a/lib/classes/module/console/aboutLicense.class.php b/lib/classes/module/console/aboutLicense.php
similarity index 100%
rename from lib/classes/module/console/aboutLicense.class.php
rename to lib/classes/module/console/aboutLicense.php
diff --git a/lib/classes/module/console/checkExtension.class.php b/lib/classes/module/console/checkExtension.php
similarity index 100%
rename from lib/classes/module/console/checkExtension.class.php
rename to lib/classes/module/console/checkExtension.php
diff --git a/lib/classes/module/console/fieldsDelete.class.php b/lib/classes/module/console/fieldsDelete.php
similarity index 100%
rename from lib/classes/module/console/fieldsDelete.class.php
rename to lib/classes/module/console/fieldsDelete.php
diff --git a/lib/classes/module/console/fieldsList.class.php b/lib/classes/module/console/fieldsList.php
similarity index 100%
rename from lib/classes/module/console/fieldsList.class.php
rename to lib/classes/module/console/fieldsList.php
diff --git a/lib/classes/module/console/fieldsMerge.class.php b/lib/classes/module/console/fieldsMerge.php
similarity index 100%
rename from lib/classes/module/console/fieldsMerge.class.php
rename to lib/classes/module/console/fieldsMerge.php
diff --git a/lib/classes/module/console/fieldsRename.class.php b/lib/classes/module/console/fieldsRename.php
similarity index 100%
rename from lib/classes/module/console/fieldsRename.class.php
rename to lib/classes/module/console/fieldsRename.php
diff --git a/lib/classes/module/console/fileEnsureDevSetting.class.php b/lib/classes/module/console/fileEnsureDevSetting.php
similarity index 100%
rename from lib/classes/module/console/fileEnsureDevSetting.class.php
rename to lib/classes/module/console/fileEnsureDevSetting.php
diff --git a/lib/classes/module/console/fileEnsureProductionSetting.class.php b/lib/classes/module/console/fileEnsureProductionSetting.php
similarity index 100%
rename from lib/classes/module/console/fileEnsureProductionSetting.class.php
rename to lib/classes/module/console/fileEnsureProductionSetting.php
diff --git a/lib/classes/module/console/schedulerStart.class.php b/lib/classes/module/console/schedulerStart.php
similarity index 100%
rename from lib/classes/module/console/schedulerStart.class.php
rename to lib/classes/module/console/schedulerStart.php
diff --git a/lib/classes/module/console/schedulerState.class.php b/lib/classes/module/console/schedulerState.php
similarity index 100%
rename from lib/classes/module/console/schedulerState.class.php
rename to lib/classes/module/console/schedulerState.php
diff --git a/lib/classes/module/console/schedulerStop.class.php b/lib/classes/module/console/schedulerStop.php
similarity index 100%
rename from lib/classes/module/console/schedulerStop.class.php
rename to lib/classes/module/console/schedulerStop.php
diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.class.php b/lib/classes/module/console/sphinxGenerateSuggestion.php
similarity index 100%
rename from lib/classes/module/console/sphinxGenerateSuggestion.class.php
rename to lib/classes/module/console/sphinxGenerateSuggestion.php
diff --git a/lib/classes/module/console/systemBackupDB.class.php b/lib/classes/module/console/systemBackupDB.php
similarity index 100%
rename from lib/classes/module/console/systemBackupDB.class.php
rename to lib/classes/module/console/systemBackupDB.php
diff --git a/lib/classes/module/console/systemClearCache.class.php b/lib/classes/module/console/systemClearCache.php
similarity index 100%
rename from lib/classes/module/console/systemClearCache.class.php
rename to lib/classes/module/console/systemClearCache.php
diff --git a/lib/classes/module/console/systemConfigCheck.class.php b/lib/classes/module/console/systemConfigCheck.php
similarity index 100%
rename from lib/classes/module/console/systemConfigCheck.class.php
rename to lib/classes/module/console/systemConfigCheck.php
diff --git a/lib/classes/module/console/systemExport.class.php b/lib/classes/module/console/systemExport.php
similarity index 100%
rename from lib/classes/module/console/systemExport.class.php
rename to lib/classes/module/console/systemExport.php
diff --git a/lib/classes/module/console/systemMailCheck.class.php b/lib/classes/module/console/systemMailCheck.php
similarity index 100%
rename from lib/classes/module/console/systemMailCheck.class.php
rename to lib/classes/module/console/systemMailCheck.php
diff --git a/lib/classes/module/console/systemTemplateGenerator.class.php b/lib/classes/module/console/systemTemplateGenerator.php
similarity index 100%
rename from lib/classes/module/console/systemTemplateGenerator.class.php
rename to lib/classes/module/console/systemTemplateGenerator.php
diff --git a/lib/classes/module/console/systemUpgrade.class.php b/lib/classes/module/console/systemUpgrade.php
similarity index 97%
rename from lib/classes/module/console/systemUpgrade.class.php
rename to lib/classes/module/console/systemUpgrade.php
index 27bba027a3..d4bec5127d 100644
--- a/lib/classes/module/console/systemUpgrade.class.php
+++ b/lib/classes/module/console/systemUpgrade.php
@@ -38,7 +38,7 @@ class module_console_systemUpgrade extends Command
protected function doExecute(InputInterface $input, OutputInterface $output)
{
- require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php';
+ require_once dirname(__FILE__) . '/../../../../vendor/autoload.php';
$interactive = !$input->getOption('yes');
diff --git a/lib/classes/module/console/taskState.class.php b/lib/classes/module/console/taskState.php
similarity index 100%
rename from lib/classes/module/console/taskState.class.php
rename to lib/classes/module/console/taskState.php
diff --git a/lib/classes/module/console/tasklist.class.php b/lib/classes/module/console/tasklist.php
similarity index 100%
rename from lib/classes/module/console/tasklist.class.php
rename to lib/classes/module/console/tasklist.php
diff --git a/lib/classes/module/console/taskrun.class.php b/lib/classes/module/console/taskrun.php
similarity index 100%
rename from lib/classes/module/console/taskrun.class.php
rename to lib/classes/module/console/taskrun.php
diff --git a/lib/classes/module/report.class.php b/lib/classes/module/report.php
similarity index 100%
rename from lib/classes/module/report.class.php
rename to lib/classes/module/report.php
diff --git a/lib/classes/module/report/activity.class.php b/lib/classes/module/report/activity.php
similarity index 100%
rename from lib/classes/module/report/activity.class.php
rename to lib/classes/module/report/activity.php
diff --git a/lib/classes/module/report/add.class.php b/lib/classes/module/report/add.php
similarity index 100%
rename from lib/classes/module/report/add.class.php
rename to lib/classes/module/report/add.php
diff --git a/lib/classes/module/report/connexion.class.php b/lib/classes/module/report/connexion.php
similarity index 100%
rename from lib/classes/module/report/connexion.class.php
rename to lib/classes/module/report/connexion.php
diff --git a/lib/classes/module/report/dashboard.class.php b/lib/classes/module/report/dashboard.php
similarity index 100%
rename from lib/classes/module/report/dashboard.class.php
rename to lib/classes/module/report/dashboard.php
diff --git a/lib/classes/module/report/dashboard/componentInterface.class.php b/lib/classes/module/report/dashboard/componentInterface.php
similarity index 100%
rename from lib/classes/module/report/dashboard/componentInterface.class.php
rename to lib/classes/module/report/dashboard/componentInterface.php
diff --git a/lib/classes/module/report/dashboard/feed.class.php b/lib/classes/module/report/dashboard/feed.php
similarity index 100%
rename from lib/classes/module/report/dashboard/feed.class.php
rename to lib/classes/module/report/dashboard/feed.php
diff --git a/lib/classes/module/report/dashboard/group.class.php b/lib/classes/module/report/dashboard/group.php
similarity index 100%
rename from lib/classes/module/report/dashboard/group.class.php
rename to lib/classes/module/report/dashboard/group.php
diff --git a/lib/classes/module/report/dashboard/merge.class.php b/lib/classes/module/report/dashboard/merge.php
similarity index 100%
rename from lib/classes/module/report/dashboard/merge.class.php
rename to lib/classes/module/report/dashboard/merge.php
diff --git a/lib/classes/module/report/dashboard/sort.class.php b/lib/classes/module/report/dashboard/sort.php
similarity index 100%
rename from lib/classes/module/report/dashboard/sort.class.php
rename to lib/classes/module/report/dashboard/sort.php
diff --git a/lib/classes/module/report/download.class.php b/lib/classes/module/report/download.php
similarity index 100%
rename from lib/classes/module/report/download.class.php
rename to lib/classes/module/report/download.php
diff --git a/lib/classes/module/report/edit.class.php b/lib/classes/module/report/edit.php
similarity index 100%
rename from lib/classes/module/report/edit.class.php
rename to lib/classes/module/report/edit.php
diff --git a/lib/classes/module/report/filter.class.php b/lib/classes/module/report/filter.php
similarity index 100%
rename from lib/classes/module/report/filter.class.php
rename to lib/classes/module/report/filter.php
diff --git a/lib/classes/module/report/nav.class.php b/lib/classes/module/report/nav.php
similarity index 100%
rename from lib/classes/module/report/nav.class.php
rename to lib/classes/module/report/nav.php
diff --git a/lib/classes/module/report/push.class.php b/lib/classes/module/report/push.php
similarity index 100%
rename from lib/classes/module/report/push.class.php
rename to lib/classes/module/report/push.php
diff --git a/lib/classes/module/report/question.class.php b/lib/classes/module/report/question.php
similarity index 100%
rename from lib/classes/module/report/question.class.php
rename to lib/classes/module/report/question.php
diff --git a/lib/classes/module/report/sql.class.php b/lib/classes/module/report/sql.php
similarity index 100%
rename from lib/classes/module/report/sql.class.php
rename to lib/classes/module/report/sql.php
diff --git a/lib/classes/module/report/sqlReportInterface.class.php b/lib/classes/module/report/sqlReportInterface.php
similarity index 100%
rename from lib/classes/module/report/sqlReportInterface.class.php
rename to lib/classes/module/report/sqlReportInterface.php
diff --git a/lib/classes/module/report/sqlaction.class.php b/lib/classes/module/report/sqlaction.php
similarity index 100%
rename from lib/classes/module/report/sqlaction.class.php
rename to lib/classes/module/report/sqlaction.php
diff --git a/lib/classes/module/report/sqlconnexion.class.php b/lib/classes/module/report/sqlconnexion.php
similarity index 100%
rename from lib/classes/module/report/sqlconnexion.class.php
rename to lib/classes/module/report/sqlconnexion.php
diff --git a/lib/classes/module/report/sqldownload.class.php b/lib/classes/module/report/sqldownload.php
similarity index 100%
rename from lib/classes/module/report/sqldownload.class.php
rename to lib/classes/module/report/sqldownload.php
diff --git a/lib/classes/module/report/sqlfilter.class.php b/lib/classes/module/report/sqlfilter.php
similarity index 100%
rename from lib/classes/module/report/sqlfilter.class.php
rename to lib/classes/module/report/sqlfilter.php
diff --git a/lib/classes/module/report/sqlquestion.class.php b/lib/classes/module/report/sqlquestion.php
similarity index 100%
rename from lib/classes/module/report/sqlquestion.class.php
rename to lib/classes/module/report/sqlquestion.php
diff --git a/lib/classes/module/report/validate.class.php b/lib/classes/module/report/validate.php
similarity index 100%
rename from lib/classes/module/report/validate.class.php
rename to lib/classes/module/report/validate.php
diff --git a/lib/classes/p4field.class.php b/lib/classes/p4field.php
similarity index 100%
rename from lib/classes/p4field.class.php
rename to lib/classes/p4field.php
diff --git a/lib/classes/p4file.class.php b/lib/classes/p4file.php
similarity index 100%
rename from lib/classes/p4file.class.php
rename to lib/classes/p4file.php
diff --git a/lib/classes/p4string.class.php b/lib/classes/p4string.php
similarity index 100%
rename from lib/classes/p4string.class.php
rename to lib/classes/p4string.php
diff --git a/lib/classes/patch/320.class.php b/lib/classes/patch/320.php
similarity index 100%
rename from lib/classes/patch/320.class.php
rename to lib/classes/patch/320.php
diff --git a/lib/classes/patch/320a.class.php b/lib/classes/patch/320a.php
similarity index 100%
rename from lib/classes/patch/320a.class.php
rename to lib/classes/patch/320a.php
diff --git a/lib/classes/patch/320ab.class.php b/lib/classes/patch/320ab.php
similarity index 100%
rename from lib/classes/patch/320ab.class.php
rename to lib/classes/patch/320ab.php
diff --git a/lib/classes/patch/320b.class.php b/lib/classes/patch/320b.php
similarity index 100%
rename from lib/classes/patch/320b.class.php
rename to lib/classes/patch/320b.php
diff --git a/lib/classes/patch/320c.class.php b/lib/classes/patch/320c.php
similarity index 100%
rename from lib/classes/patch/320c.class.php
rename to lib/classes/patch/320c.php
diff --git a/lib/classes/patch/320d.class.php b/lib/classes/patch/320d.php
similarity index 100%
rename from lib/classes/patch/320d.class.php
rename to lib/classes/patch/320d.php
diff --git a/lib/classes/patch/320e.class.php b/lib/classes/patch/320e.php
similarity index 100%
rename from lib/classes/patch/320e.class.php
rename to lib/classes/patch/320e.php
diff --git a/lib/classes/patch/320f.class.php b/lib/classes/patch/320f.php
similarity index 100%
rename from lib/classes/patch/320f.class.php
rename to lib/classes/patch/320f.php
diff --git a/lib/classes/patch/320h.class.php b/lib/classes/patch/320h.php
similarity index 100%
rename from lib/classes/patch/320h.class.php
rename to lib/classes/patch/320h.php
diff --git a/lib/classes/patch/360.class.php b/lib/classes/patch/360.php
similarity index 100%
rename from lib/classes/patch/360.class.php
rename to lib/classes/patch/360.php
diff --git a/lib/classes/patch/3602.class.php b/lib/classes/patch/3602.php
similarity index 100%
rename from lib/classes/patch/3602.class.php
rename to lib/classes/patch/3602.php
diff --git a/lib/classes/patch/3603.class.php b/lib/classes/patch/3603.php
similarity index 100%
rename from lib/classes/patch/3603.class.php
rename to lib/classes/patch/3603.php
diff --git a/lib/classes/patch/3604.class.php b/lib/classes/patch/3604.php
similarity index 100%
rename from lib/classes/patch/3604.class.php
rename to lib/classes/patch/3604.php
diff --git a/lib/classes/patch/361.class.php b/lib/classes/patch/361.php
similarity index 100%
rename from lib/classes/patch/361.class.php
rename to lib/classes/patch/361.php
diff --git a/lib/classes/patch/370.class.php b/lib/classes/patch/370.php
similarity index 100%
rename from lib/classes/patch/370.class.php
rename to lib/classes/patch/370.php
diff --git a/lib/classes/patch/370a3.class.php b/lib/classes/patch/370a3.php
similarity index 100%
rename from lib/classes/patch/370a3.class.php
rename to lib/classes/patch/370a3.php
diff --git a/lib/classes/patch/370a4.class.php b/lib/classes/patch/370a4.php
similarity index 100%
rename from lib/classes/patch/370a4.class.php
rename to lib/classes/patch/370a4.php
diff --git a/lib/classes/patch/370a5.class.php b/lib/classes/patch/370a5.php
similarity index 100%
rename from lib/classes/patch/370a5.class.php
rename to lib/classes/patch/370a5.php
diff --git a/lib/classes/patch/370a6.class.php b/lib/classes/patch/370a6.php
similarity index 100%
rename from lib/classes/patch/370a6.class.php
rename to lib/classes/patch/370a6.php
diff --git a/lib/classes/patch/370a7.class.php b/lib/classes/patch/370a7.php
similarity index 100%
rename from lib/classes/patch/370a7.class.php
rename to lib/classes/patch/370a7.php
diff --git a/lib/classes/patch/370a8.class.php b/lib/classes/patch/370a8.php
similarity index 100%
rename from lib/classes/patch/370a8.class.php
rename to lib/classes/patch/370a8.php
diff --git a/lib/classes/patch/370a9.class.php b/lib/classes/patch/370a9.php
similarity index 100%
rename from lib/classes/patch/370a9.class.php
rename to lib/classes/patch/370a9.php
diff --git a/lib/classes/patch/371.class.php b/lib/classes/patch/371.php
similarity index 100%
rename from lib/classes/patch/371.class.php
rename to lib/classes/patch/371.php
diff --git a/lib/classes/patch/373.class.php b/lib/classes/patch/373.php
similarity index 100%
rename from lib/classes/patch/373.class.php
rename to lib/classes/patch/373.php
diff --git a/lib/classes/patch/380.class.php b/lib/classes/patch/380.php
similarity index 100%
rename from lib/classes/patch/380.class.php
rename to lib/classes/patch/380.php
diff --git a/lib/classes/patch/3802.class.php b/lib/classes/patch/3802.php
similarity index 100%
rename from lib/classes/patch/3802.class.php
rename to lib/classes/patch/3802.php
diff --git a/lib/classes/patch/3803.class.php b/lib/classes/patch/3803.php
similarity index 100%
rename from lib/classes/patch/3803.class.php
rename to lib/classes/patch/3803.php
diff --git a/lib/classes/patchInterface.class.php b/lib/classes/patchInterface.php
similarity index 100%
rename from lib/classes/patchInterface.class.php
rename to lib/classes/patchInterface.php
diff --git a/lib/classes/phrasea.class.php b/lib/classes/phrasea.php
similarity index 94%
rename from lib/classes/phrasea.class.php
rename to lib/classes/phrasea.php
index 8d9bb7623c..492462836e 100644
--- a/lib/classes/phrasea.class.php
+++ b/lib/classes/phrasea.php
@@ -48,31 +48,6 @@ class phrasea
return $retval;
}
- public static function start(Configuration $configuration)
- {
- $choosenConnexion = $configuration->getPhraseanet()->get('database');
-
- $connexion = $configuration->getConnexion($choosenConnexion);
-
- $hostname = $connexion->get('host');
- $port = (int) $connexion->get('port');
- $user = $connexion->get('user');
- $password = $connexion->get('password');
- $dbname = $connexion->get('dbname');
-
- if (!extension_loaded('phrasea2')) {
- throw new RuntimeException('Phrasea extension is required');
- }
-
- if (!function_exists('phrasea_conn')) {
- throw new RuntimeException('Phrasea extension requires upgrade');
- }
-
- if (phrasea_conn($hostname, $port, $user, $password, $dbname) !== true) {
- throw new RuntimeException('Unable to initialize Phrasea connection');
- }
- }
-
public function getHome(Application $app, $type = 'PUBLI', $context = 'prod')
{
if ($type == 'HELP') {
diff --git a/lib/classes/phraseadate.class.php b/lib/classes/phraseadate.php
similarity index 100%
rename from lib/classes/phraseadate.class.php
rename to lib/classes/phraseadate.php
diff --git a/lib/classes/queries.class.php b/lib/classes/queries.php
similarity index 100%
rename from lib/classes/queries.class.php
rename to lib/classes/queries.php
diff --git a/lib/classes/random.class.php b/lib/classes/random.php
similarity index 100%
rename from lib/classes/random.class.php
rename to lib/classes/random.php
diff --git a/lib/classes/record/Interface.class.php b/lib/classes/record/Interface.php
similarity index 100%
rename from lib/classes/record/Interface.class.php
rename to lib/classes/record/Interface.php
diff --git a/lib/classes/record/adapter.class.php b/lib/classes/record/adapter.php
similarity index 100%
rename from lib/classes/record/adapter.class.php
rename to lib/classes/record/adapter.php
diff --git a/lib/classes/record/exportElement.class.php b/lib/classes/record/exportElement.php
similarity index 100%
rename from lib/classes/record/exportElement.class.php
rename to lib/classes/record/exportElement.php
diff --git a/lib/classes/record/orderElement.class.php b/lib/classes/record/orderElement.php
similarity index 100%
rename from lib/classes/record/orderElement.class.php
rename to lib/classes/record/orderElement.php
diff --git a/lib/classes/record/preview.class.php b/lib/classes/record/preview.php
similarity index 100%
rename from lib/classes/record/preview.class.php
rename to lib/classes/record/preview.php
diff --git a/lib/classes/recordutils.class.php b/lib/classes/recordutils.php
similarity index 100%
rename from lib/classes/recordutils.class.php
rename to lib/classes/recordutils.php
diff --git a/lib/classes/recordutils/audio.class.php b/lib/classes/recordutils/audio.php
similarity index 100%
rename from lib/classes/recordutils/audio.class.php
rename to lib/classes/recordutils/audio.php
diff --git a/lib/classes/recordutils/document.class.php b/lib/classes/recordutils/document.php
similarity index 100%
rename from lib/classes/recordutils/document.class.php
rename to lib/classes/recordutils/document.php
diff --git a/lib/classes/recordutils/image.class.php b/lib/classes/recordutils/image.php
similarity index 100%
rename from lib/classes/recordutils/image.class.php
rename to lib/classes/recordutils/image.php
diff --git a/lib/classes/recordutils/map.class.php b/lib/classes/recordutils/map.php
similarity index 100%
rename from lib/classes/recordutils/map.class.php
rename to lib/classes/recordutils/map.php
diff --git a/lib/classes/recordutils/video.class.php b/lib/classes/recordutils/video.php
similarity index 100%
rename from lib/classes/recordutils/video.class.php
rename to lib/classes/recordutils/video.php
diff --git a/lib/classes/registry.class.php b/lib/classes/registry.php
similarity index 100%
rename from lib/classes/registry.class.php
rename to lib/classes/registry.php
diff --git a/lib/classes/registryInterface.class.php b/lib/classes/registryInterface.php
similarity index 100%
rename from lib/classes/registryInterface.class.php
rename to lib/classes/registryInterface.php
diff --git a/lib/classes/set/abstract.class.php b/lib/classes/set/abstract.php
similarity index 100%
rename from lib/classes/set/abstract.class.php
rename to lib/classes/set/abstract.php
diff --git a/lib/classes/set/export.class.php b/lib/classes/set/export.php
similarity index 100%
rename from lib/classes/set/export.class.php
rename to lib/classes/set/export.php
diff --git a/lib/classes/set/exportftp.class.php b/lib/classes/set/exportftp.php
similarity index 100%
rename from lib/classes/set/exportftp.class.php
rename to lib/classes/set/exportftp.php
diff --git a/lib/classes/set/order.class.php b/lib/classes/set/order.php
similarity index 100%
rename from lib/classes/set/order.class.php
rename to lib/classes/set/order.php
diff --git a/lib/classes/set/selection.class.php b/lib/classes/set/selection.php
similarity index 100%
rename from lib/classes/set/selection.class.php
rename to lib/classes/set/selection.php
diff --git a/lib/classes/setup.class.php b/lib/classes/setup.php
similarity index 100%
rename from lib/classes/setup.class.php
rename to lib/classes/setup.php
diff --git a/lib/classes/sso.class.php b/lib/classes/sso.php
similarity index 100%
rename from lib/classes/sso.class.php
rename to lib/classes/sso.php
diff --git a/lib/classes/system/server.class.php b/lib/classes/system/server.php
similarity index 100%
rename from lib/classes/system/server.class.php
rename to lib/classes/system/server.php
diff --git a/lib/classes/system/url.class.php b/lib/classes/system/url.php
similarity index 100%
rename from lib/classes/system/url.class.php
rename to lib/classes/system/url.php
diff --git a/lib/classes/task/Scheduler.class.php b/lib/classes/task/Scheduler.php
similarity index 100%
rename from lib/classes/task/Scheduler.class.php
rename to lib/classes/task/Scheduler.php
diff --git a/lib/classes/task/abstract.class.php b/lib/classes/task/abstract.php
similarity index 100%
rename from lib/classes/task/abstract.class.php
rename to lib/classes/task/abstract.php
diff --git a/lib/classes/task/appboxAbstract.class.php b/lib/classes/task/appboxAbstract.php
similarity index 100%
rename from lib/classes/task/appboxAbstract.class.php
rename to lib/classes/task/appboxAbstract.php
diff --git a/lib/classes/task/databoxAbstract.class.php b/lib/classes/task/databoxAbstract.php
similarity index 100%
rename from lib/classes/task/databoxAbstract.class.php
rename to lib/classes/task/databoxAbstract.php
diff --git a/lib/classes/task/manager.class.php b/lib/classes/task/manager.php
similarity index 99%
rename from lib/classes/task/manager.class.php
rename to lib/classes/task/manager.php
index 02c505bc3a..ff98cb75e3 100644
--- a/lib/classes/task/manager.class.php
+++ b/lib/classes/task/manager.php
@@ -215,7 +215,7 @@ class task_manager
if (($hdir = @opendir($path)) != FALSE) {
$max = 9999;
while (($max-- > 0) && (($file = readdir($hdir)) !== false)) {
- if (!is_file($path . '/' . $file) || substr($file, 0, 1) == "." || substr($file, -10) != ".class.php") {
+ if (!is_file($path . '/' . $file) || substr($file, 0, 1) == "." || substr($file, -10) != ".php") {
continue;
}
diff --git a/lib/classes/task/period/RecordMover.class.php b/lib/classes/task/period/RecordMover.php
similarity index 100%
rename from lib/classes/task/period/RecordMover.class.php
rename to lib/classes/task/period/RecordMover.php
diff --git a/lib/classes/task/period/apibridge.class.php b/lib/classes/task/period/apibridge.php
similarity index 100%
rename from lib/classes/task/period/apibridge.class.php
rename to lib/classes/task/period/apibridge.php
diff --git a/lib/classes/task/period/archive.class.php b/lib/classes/task/period/archive.php
similarity index 100%
rename from lib/classes/task/period/archive.class.php
rename to lib/classes/task/period/archive.php
diff --git a/lib/classes/task/period/cindexer.class.php b/lib/classes/task/period/cindexer.php
similarity index 100%
rename from lib/classes/task/period/cindexer.class.php
rename to lib/classes/task/period/cindexer.php
diff --git a/lib/classes/task/period/emptyColl.class.php b/lib/classes/task/period/emptyColl.php
similarity index 100%
rename from lib/classes/task/period/emptyColl.class.php
rename to lib/classes/task/period/emptyColl.php
diff --git a/lib/classes/task/period/ftp.class.php b/lib/classes/task/period/ftp.php
similarity index 100%
rename from lib/classes/task/period/ftp.class.php
rename to lib/classes/task/period/ftp.php
diff --git a/lib/classes/task/period/ftpPull.class.php b/lib/classes/task/period/ftpPull.php
similarity index 100%
rename from lib/classes/task/period/ftpPull.class.php
rename to lib/classes/task/period/ftpPull.php
diff --git a/lib/classes/task/period/outofdate.class.php b/lib/classes/task/period/outofdate.php
similarity index 100%
rename from lib/classes/task/period/outofdate.class.php
rename to lib/classes/task/period/outofdate.php
diff --git a/lib/classes/task/period/subdef.class.php b/lib/classes/task/period/subdef.php
similarity index 100%
rename from lib/classes/task/period/subdef.class.php
rename to lib/classes/task/period/subdef.php
diff --git a/lib/classes/task/period/test.class.php b/lib/classes/task/period/test.php
similarity index 100%
rename from lib/classes/task/period/test.class.php
rename to lib/classes/task/period/test.php
diff --git a/lib/classes/task/period/workflow01.class.php b/lib/classes/task/period/workflow01.php
similarity index 100%
rename from lib/classes/task/period/workflow01.class.php
rename to lib/classes/task/period/workflow01.php
diff --git a/lib/classes/task/period/writemeta.class.php b/lib/classes/task/period/writemeta.php
similarity index 100%
rename from lib/classes/task/period/writemeta.class.php
rename to lib/classes/task/period/writemeta.php
diff --git a/lib/classes/thesaurus.class.php b/lib/classes/thesaurus.php
similarity index 100%
rename from lib/classes/thesaurus.class.php
rename to lib/classes/thesaurus.php
diff --git a/lib/classes/thesaurus/xpath.class.php b/lib/classes/thesaurus/xpath.php
similarity index 100%
rename from lib/classes/thesaurus/xpath.class.php
rename to lib/classes/thesaurus/xpath.php
diff --git a/lib/classes/unicode.class.php b/lib/classes/unicode.php
similarity index 100%
rename from lib/classes/unicode.class.php
rename to lib/classes/unicode.php
diff --git a/lib/classes/uuid.class.php b/lib/classes/uuid.php
similarity index 100%
rename from lib/classes/uuid.class.php
rename to lib/classes/uuid.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 78296c7c70..8edf7086da 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
stopOnFailure="false"
syntaxCheck="true"
verbose="false"
- bootstrap="tests/bootstrap.inc"
+ bootstrap="tests/bootstrap.php"
>