* [ADD] Using composer for dependency management

This commit is contained in:
nuxsmin
2017-09-20 00:59:53 +02:00
parent 217feca46f
commit 9676f43813
38 changed files with 15 additions and 78 deletions

View File

@@ -43,25 +43,7 @@ define('SQL_PATH', BASE_DIR . DIRECTORY_SEPARATOR . 'sql');
define('DEBUG', true);
require VENDOR_PATH . DIRECTORY_SEPARATOR . 'autoload.php';
// Required random_compat polyfill for random_bytes() and random_int()
// @see https://github.com/paragonie/random_compat/tree/v2.0.4#random_compat
//require_once EXTENSIONS_PATH . DIRECTORY_SEPARATOR . 'random_compat' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'random.php';
//
require __DIR__ . DIRECTORY_SEPARATOR . 'SplClassLoader.php';
//
//$ClassLoader = new SplClassLoader('SP');
//$ClassLoader->setFileExtension('.class.php');
//$ClassLoader->addExcluded('SP\\Profile');
//$ClassLoader->addExcluded('SP\\Mgmt\\User\\Profile');
//$ClassLoader->addExcluded('SP\\UserPreferences');
//$ClassLoader->addExcluded('SP\\Mgmt\\User\\UserPreferences');
//$ClassLoader->addExcluded('SP\\CustomFieldDef');
//$ClassLoader->addExcluded('SP\\Mgmt\\CustomFieldDef');
//$ClassLoader->addExcluded('SP\\PublicLink');
//$ClassLoader->register();
require __DIR__ . DIRECTORY_SEPARATOR . 'BaseFunctions.php';
// Empezar a calcular la memoria utilizada

View File

@@ -27,7 +27,6 @@ namespace SP\Account;
use SP\DataModel\AccountData;
use SP\DataModel\AccountExtData;
use SP\DataModel\AccountHistoryData;
use SP\Mgmt\Groups\GroupAccountsUtil;
defined('APP_ROOT') || die();

View File

@@ -27,11 +27,9 @@ namespace SP\Account;
use Defuse\Crypto\Exception\CryptoException;
use SP\Core\Crypt\Crypt;
use SP\Core\Exceptions\QueryException;
use SP\Core\Messages\TaskMessage;
use SP\Core\OldCrypt;
use SP\Core\Exceptions\SPException;
use SP\Core\OldCrypt;
use SP\Core\Session;
use SP\Core\Task;
use SP\Core\TaskFactory;
use SP\DataModel\AccountData;
use SP\Log\Email;

View File

@@ -24,7 +24,6 @@
namespace SP\Account;
use SP\Core\Exceptions\SPException;
use SP\Storage\DB;
use SP\Storage\QueryData;

View File

@@ -25,12 +25,9 @@
namespace SP\Account;
use SP\Config\ConfigDB;
use SP\Core\OldCrypt;
use SP\Core\Exceptions\SPException;
use SP\Log\Log;
use SP\Storage\DB;
use SP\Storage\QueryData;
use SP\Util\Checks;
defined('APP_ROOT') || die();

View File

@@ -28,10 +28,8 @@ use Defuse\Crypto\Exception\CryptoException;
use SP\Core\Crypt\Crypt;
use SP\Core\Crypt\Hash;
use SP\Core\Exceptions\QueryException;
use SP\Core\Messages\TaskMessage;
use SP\Core\OldCrypt;
use SP\Core\Exceptions\SPException;
use SP\Core\Task;
use SP\Core\OldCrypt;
use SP\Core\TaskFactory;
use SP\Log\Email;
use SP\Log\Log;

View File

@@ -27,7 +27,6 @@ namespace SP\Account;
defined('APP_ROOT') || die();
use SP\Config\Config;
use SP\Core\Session;
use SP\DataModel\AccountSearchData;
use SP\Html\Html;
use SP\Mgmt\Groups\GroupAccountsUtil;

View File

@@ -30,7 +30,6 @@ use SP\Core\Exceptions\SPException;
use SP\DataModel\TrackData;
use SP\Mgmt\Tracks\Track;
use SP\Util\HttpUtil;
use SP\Util\Util;
/**
* Class ApiUtil

View File

@@ -33,7 +33,6 @@ use SP\Auth\Ldap\LdapMsAds;
use SP\Auth\Ldap\LdapStd;
use SP\Config\Config;
use SP\Core\Exceptions\SPException;
use SP\DataModel\UserData;
use SP\DataModel\UserLoginData;
use SP\Util\Checks;

View File

@@ -35,13 +35,11 @@ use SP\Config\Config;
use SP\Core\Acl;
use SP\Core\ActionsInterface;
use SP\Core\Crypt\Crypt;
use SP\Core\OldCrypt;
use SP\Core\Exceptions\SPException;
use SP\Core\Init;
use SP\Core\Session;
use SP\Core\SessionUtil;
use SP\Core\Template;
use SP\DataModel\AccountData;
use SP\DataModel\AccountExtData;
use SP\DataModel\CustomFieldData;
use SP\DataModel\PublicLinkData;

View File

@@ -31,7 +31,6 @@ use SP\Core\DiFactory;
use SP\Core\Events\EventDispatcherInterface;
use SP\Core\Exceptions\FileNotFoundException;
use SP\Core\Exceptions\SPException;
use SP\Core\Init;
use SP\Core\Session;
use SP\Core\Template;
use SP\Core\UI\ThemeIconsBase;

View File

@@ -27,7 +27,6 @@ namespace SP\Controller;
defined('APP_ROOT') || die();
use SP\Core\ActionsInterface;
use SP\Core\Messages\LogMessage;
use SP\Core\SessionUtil;
use SP\Core\Template;
use SP\Html\DataGrid\DataGridActionSearch;

View File

@@ -30,7 +30,6 @@ use SP\Account\Account;
use SP\Account\AccountAcl;
use SP\Account\AccountHistory;
use SP\Config\Config;
use SP\Mgmt\ApiTokens\ApiTokensUtil;
use SP\Core\ActionsInterface;
use SP\Core\Crypt\Crypt;
use SP\Core\Crypt\Session as CryptSession;
@@ -53,6 +52,7 @@ use SP\Http\Request;
use SP\Log\Email;
use SP\Log\Log;
use SP\Mgmt\ApiTokens\ApiToken;
use SP\Mgmt\ApiTokens\ApiTokensUtil;
use SP\Mgmt\Categories\Category;
use SP\Mgmt\Customers\Customer;
use SP\Mgmt\CustomFields\CustomField;

View File

@@ -40,19 +40,13 @@ use SP\Core\Session;
use SP\Core\SessionUtil;
use SP\Core\Task;
use SP\Core\Template;
use SP\Core\Upgrade\Account;
use SP\Core\Upgrade\Check;
use SP\Core\Upgrade\Upgrade;
use SP\DataModel\NoticeData;
use SP\Html\DataGrid\DataGridAction;
use SP\Html\Html;
use SP\Http\Request;
use SP\Mgmt\Categories\Category;
use SP\Mgmt\Customers\Customer;
use SP\Mgmt\Groups\Group;
use SP\Mgmt\Notices\Notice;
use SP\Mgmt\PublicLinks\PublicLink;
use SP\Mgmt\Users\User;
use SP\Util\Checks;
use SP\Util\HttpUtil;
use SP\Util\Util;

View File

@@ -27,7 +27,6 @@ namespace SP\Controller;
defined('APP_ROOT') || die();
use SP\Core\ActionsInterface;
use SP\Core\Init;
use SP\Core\SessionUtil;
use SP\Core\Template;
use SP\DataModel\NoticeData;
@@ -35,7 +34,6 @@ use SP\Mgmt\Notices\Notice;
use SP\Mgmt\Users\User;
use SP\Util\Checks;
use SP\Util\Json;
use SP\Util\Util;
/**
* Class NoticeShowController

View File

@@ -25,10 +25,7 @@
namespace SP\Core;
use SP\DataModel\AccountExtData;
use SP\DataModel\UserData;
use SP\Log\Log;
use SP\Mgmt\Groups\GroupUsers;
defined('APP_ROOT') || die();

View File

@@ -26,7 +26,6 @@ namespace SP\Core\Crypt;
use Defuse\Crypto\Crypto;
use Defuse\Crypto\Exception\CryptoException;
use Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException;
use Defuse\Crypto\Key;
use Defuse\Crypto\KeyProtectedByPassword;

View File

@@ -29,7 +29,6 @@ use Defuse\Crypto\Key;
use SP\Core\Init;
use SP\Http\Request;
use SP\Util\HttpUtil;
use SP\Util\Util;
/**
* Class SecureKeyCookie

View File

@@ -25,9 +25,9 @@
namespace SP\Core;
use SP\Config\ConfigDB;
use SP\Core\Crypt\Session as CryptSession;
use SP\Core\Crypt\Crypt;
use SP\Core\Crypt\Hash;
use SP\Core\Crypt\Session as CryptSession;
use SP\Log\Log;
use SP\Util\Util;

View File

@@ -25,7 +25,6 @@
namespace SP\Core\Exceptions;
use Exception;
use Throwable;
defined('APP_ROOT') || die();

View File

@@ -25,13 +25,13 @@
namespace SP\Core;
use Defuse\Crypto\Exception\CryptoException;
use SP\Util\HttpUtil;
use SP\Account\AccountAcl;
use SP\Auth\Browser\Browser;
use SP\Config\Config;
use SP\Controller\MainController;
use SP\Core\Crypt\SecureKeyCookie;
use SP\Core\Crypt\CryptSessionHandler;
use SP\Core\Crypt\SecureKeyCookie;
use SP\Core\Crypt\Session as CryptSession;
use SP\Core\Exceptions\SPException;
use SP\Core\Plugin\PluginUtil;
use SP\Core\Upgrade\Upgrade;
@@ -42,9 +42,9 @@ use SP\Log\Log;
use SP\Mgmt\Profiles\Profile;
use SP\Storage\DBUtil;
use SP\Util\Checks;
use SP\Util\HttpUtil;
use SP\Util\Json;
use SP\Util\Util;
use SP\Core\Crypt\Session as CryptSession;
defined('APP_ROOT') || die();

View File

@@ -26,7 +26,6 @@ namespace SP\Core;
use SP\Config\Config;
use SP\Http\Request;
use SP\Mgmt\Users\UserPreferences;
defined('APP_ROOT') || die();

View File

@@ -24,11 +24,8 @@
namespace SP\Core;
use SP\Account\AccountHistory;
use SP\Config\Config;
use SP\Config\ConfigDB;
use SP\Core\Exceptions\SPException;
use SP\Log\Log;
use SP\Util\Checks;
defined('APP_ROOT') || die();

View File

@@ -25,9 +25,9 @@
namespace SP\Core;
use SP\Config\Config;
use SP\Core\Crypt\Session as CryptSession;
use SP\DataModel\UserData;
use SP\Mgmt\Profiles\Profile;
use SP\Core\Crypt\Session as CryptSession;
defined('APP_ROOT') || die();

View File

@@ -30,7 +30,6 @@ use SP\Account\AccountHistoryCrypt;
use SP\Config\ConfigDB;
use SP\Core\Crypt\Hash;
use SP\Core\Exceptions\SPException;
use SP\Core\Init;
use SP\Log\Log;
use SP\Mgmt\CustomFields\CustomFieldsUtil;
use SP\Mgmt\Users\UserMigrate;

View File

@@ -33,6 +33,7 @@ use SP\Core\Exceptions\SPException;
use SP\Core\Init;
use SP\Core\Session as CoreSession;
use SP\Core\TaskFactory;
use SP\Core\Upgrade\User as UserUpgrade;
use SP\Http\Request;
use SP\Log\Email;
use SP\Log\Log;
@@ -44,7 +45,6 @@ use SP\Mgmt\Users\UserPreferencesUtil;
use SP\Storage\DB;
use SP\Storage\QueryData;
use SP\Util\Util;
use SP\Core\Upgrade\User as UserUpgrade;
defined('APP_ROOT') || die();

View File

@@ -28,7 +28,6 @@ use SP\Core\ActionsInterface;
use SP\Core\Exceptions\ValidationException;
use SP\DataModel\ApiTokenData;
use SP\Http\Request;
use SP\Mgmt\ApiTokens\ApiTokensUtil;
/**
* Class ApiTokenForm

View File

@@ -27,9 +27,9 @@ namespace SP\Import;
use SP\Account\Account;
use SP\Account\AccountTags;
use SP\Core\Crypt\Crypt;
use SP\Core\OldCrypt;
use SP\Core\Exceptions\SPException;
use SP\Core\Messages\LogMessage;
use SP\Core\OldCrypt;
use SP\DataModel\AccountExtData;
use SP\DataModel\CategoryData;
use SP\DataModel\CustomerData;

View File

@@ -25,13 +25,11 @@
namespace SP\Import;
use DOMXPath;
use SP\Account\AccountTags;
use SP\Config\ConfigDB;
use SP\Core\Crypt\Crypt;
use SP\Core\OldCrypt;
use SP\Core\Crypt\Hash;
use SP\Core\Exceptions\SPException;
use SP\DataModel\AccountData;
use SP\Core\OldCrypt;
use SP\DataModel\AccountExtData;
use SP\DataModel\CategoryData;
use SP\DataModel\CustomerData;

View File

@@ -24,7 +24,6 @@
namespace SP\Log;
use phpmailer\PHPMailer;
use phpmailer\phpmailerException;
use SP\Config\Config;
use SP\Core\Init;

View File

@@ -29,8 +29,8 @@ defined('APP_ROOT') || die();
use Defuse\Crypto\Exception\CryptoException;
use SP\Core\Crypt\Crypt;
use SP\Core\Exceptions\QueryException;
use SP\Core\OldCrypt;
use SP\Core\Exceptions\SPException;
use SP\Core\OldCrypt;
use SP\DataModel\CustomFieldData;
use SP\DataModel\CustomFieldDefData;
use SP\Log\Log;

View File

@@ -28,7 +28,6 @@ defined('APP_ROOT') || die();
use SP\Core\Exceptions\InvalidClassException;
use SP\DataModel\UserData;
use SP\DataModel\UserLoginData;
use SP\Mgmt\ItemBaseInterface;
use SP\Mgmt\ItemBaseTrait;

View File

@@ -32,6 +32,7 @@ use SP\Config\ConfigDB;
use SP\Controller\LoginController;
use SP\Core\Crypt\Crypt;
use SP\Core\Crypt\Hash;
use SP\Core\Crypt\Session as CryptSession;
use SP\Core\Exceptions\InvalidClassException;
use SP\Core\Exceptions\QueryException;
use SP\Core\Exceptions\SPException;
@@ -43,7 +44,6 @@ use SP\Log\Email;
use SP\Log\Log;
use SP\Storage\DB;
use SP\Storage\QueryData;
use SP\Core\Crypt\Session as CryptSession;
/**
* Class UserPass para la gestión de las claves de un usuario

View File

@@ -26,7 +26,6 @@ namespace SP\Mgmt\Users;
defined('APP_ROOT') || die();
use SP\Core\Exceptions\SPException;
use SP\DataModel\UserData;
use SP\DataModel\UserPreferencesData;
use SP\Mgmt\ItemInterface;

View File

@@ -27,8 +27,6 @@ namespace SP\Mgmt\Users;
use SP\Config\Config;
use SP\Core\Crypt\Hash;
use SP\Core\Exceptions\SPException;
use SP\DataModel\UserData;
use SP\DataModel\UserLoginData;
use SP\Log\Email;
use SP\Log\Log;
use SP\Storage\DB;

View File

@@ -32,9 +32,7 @@ use SP\Core\Exceptions\SPException;
use SP\Core\Init;
use SP\Core\Installer;
use SP\Core\Session;
use SP\Core\Upgrade\Upgrade;
use SP\Html\Html;
use SP\Http\Request;
use SP\Log\Log;
use SP\Log\LogUtil;

View File

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
'Base2n' => $vendorDir . '/ademarre/binary-to-text-php/Base2n.php',
'Defuse\\Crypto\\Core' => $vendorDir . '/defuse/php-encryption/src/Core.php',
'Defuse\\Crypto\\Crypto' => $vendorDir . '/defuse/php-encryption/src/Crypto.php',
'Defuse\\Crypto\\DerivedKeys' => $vendorDir . '/defuse/php-encryption/src/DerivedKeys.php',
@@ -318,6 +317,7 @@ return array(
'SP\\Mgmt\\Users\\UserPreferences' => $baseDir . '/inc/SP/Mgmt/Users/UserPreferences.php',
'SP\\Mgmt\\Users\\UserPreferencesBase' => $baseDir . '/inc/SP/Mgmt/Users/UserPreferencesBase.php',
'SP\\Mgmt\\Users\\UserPreferencesUtil' => $baseDir . '/inc/SP/Mgmt/Users/UserPreferencesUtil.php',
'SP\\Mgmt\\Users\\UserSSO' => $baseDir . '/inc/SP/Mgmt/Users/UserSSO.php',
'SP\\Mgmt\\Users\\UserSearch' => $baseDir . '/inc/SP/Mgmt/Users/UserSearch.php',
'SP\\Mgmt\\Users\\UserUtil' => $baseDir . '/inc/SP/Mgmt/Users/UserUtil.php',
'SP\\Storage\\DB' => $baseDir . '/inc/SP/Storage/DB.php',

View File

@@ -60,7 +60,6 @@ class ComposerStaticInit1701764f82c629b16cc164189600cb41
);
public static $classMap = array (
'Base2n' => __DIR__ . '/..' . '/ademarre/binary-to-text-php/Base2n.php',
'Defuse\\Crypto\\Core' => __DIR__ . '/..' . '/defuse/php-encryption/src/Core.php',
'Defuse\\Crypto\\Crypto' => __DIR__ . '/..' . '/defuse/php-encryption/src/Crypto.php',
'Defuse\\Crypto\\DerivedKeys' => __DIR__ . '/..' . '/defuse/php-encryption/src/DerivedKeys.php',
@@ -372,6 +371,7 @@ class ComposerStaticInit1701764f82c629b16cc164189600cb41
'SP\\Mgmt\\Users\\UserPreferences' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserPreferences.php',
'SP\\Mgmt\\Users\\UserPreferencesBase' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserPreferencesBase.php',
'SP\\Mgmt\\Users\\UserPreferencesUtil' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserPreferencesUtil.php',
'SP\\Mgmt\\Users\\UserSSO' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserSSO.php',
'SP\\Mgmt\\Users\\UserSearch' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserSearch.php',
'SP\\Mgmt\\Users\\UserUtil' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserUtil.php',
'SP\\Storage\\DB' => __DIR__ . '/../..' . '/inc/SP/Storage/DB.php',