From 0199c0eb9e9c2e076af39a65c14c36b27f06de8e Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 17:52:36 +0200 Subject: [PATCH 001/140] calcoen eclipse files --- .buildpath | 619 ++++++++++++++ .dbeaver/.credentials-config.json.bak | 2 + .dbeaver/.data-sources.json.bak | 61 ++ .dbeaver/credentials-config.json | 1 + .dbeaver/data-sources.json | 29 + .project | 46 + .settings/org.eclipse.php.core.prefs | 2 + ....eclipse.wst.common.project.facet.core.xml | 9 + .settings/org.eclipse.wst.validation.prefs | 2 + app/SymfonyRequirements.php | 806 ++++++++++++++++++ app/check.php | 141 +++ 11 files changed, 1718 insertions(+) create mode 100755 .buildpath create mode 100755 .dbeaver/.credentials-config.json.bak create mode 100755 .dbeaver/.data-sources.json.bak create mode 100755 .dbeaver/credentials-config.json create mode 100755 .dbeaver/data-sources.json create mode 100755 .project create mode 100755 .settings/org.eclipse.php.core.prefs create mode 100755 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100755 .settings/org.eclipse.wst.validation.prefs create mode 100755 app/SymfonyRequirements.php create mode 100755 app/check.php diff --git a/.buildpath b/.buildpath new file mode 100755 index 000000000..ad4b4c718 --- /dev/null +++ b/.buildpath @@ -0,0 +1,619 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.dbeaver/.credentials-config.json.bak b/.dbeaver/.credentials-config.json.bak new file mode 100755 index 000000000..7e91f62f7 --- /dev/null +++ b/.dbeaver/.credentials-config.json.bak @@ -0,0 +1,2 @@ +H|kt씉XCw$$'c#H+ɕ]D P,X<~WG8BL2Sp={w F UOA15@eiY묖ۮHm +յ?2!EqLEj $3/H'9*rQp]J;~no+$,T!950t#bn'%CIM9:} \ No newline at end of file diff --git a/.dbeaver/.data-sources.json.bak b/.dbeaver/.data-sources.json.bak new file mode 100755 index 000000000..ea4614170 --- /dev/null +++ b/.dbeaver/.data-sources.json.bak @@ -0,0 +1,61 @@ +{ + "folders": {}, + "connections": { + "mysql8-177f1df173f-2ff7634518f3a52d": { + "provider": "mysql", + "driver": "mysql8", + "name": "localhost", + "save-password": true, + "read-only": false, + "configuration": { + "host": "localhost", + "port": "3306", + "url": "jdbc:mysql://localhost:3306/", + "type": "dev", + "auth-model": "native", + "handlers": {} + } + }, + "mysql8-177f1e0b513-747f1c1518866031": { + "provider": "mysql", + "driver": "mysql8", + "name": "localhost 2", + "save-password": true, + "read-only": false, + "configuration": { + "host": "localhost", + "port": "3306", + "url": "jdbc:mysql://localhost:3306/", + "type": "dev", + "auth-model": "native", + "handlers": {} + } + }, + "mysql8-177f1e12c0e-6e8b2b03ff11ca68": { + "provider": "mysql", + "driver": "mysql8", + "name": "localhost 3", + "save-password": true, + "read-only": false, + "configuration": { + "host": "localhost", + "port": "3306", + "url": "jdbc:mysql://localhost:3306/", + "home": "/usr/bin", + "type": "dev", + "auth-model": "native", + "handlers": {} + } + } + }, + "connection-types": { + "dev": { + "name": "Development", + "color": "255,255,255", + "description": "Regular development database", + "auto-commit": true, + "confirm-execute": false, + "confirm-data-change": false + } + } +} \ No newline at end of file diff --git a/.dbeaver/credentials-config.json b/.dbeaver/credentials-config.json new file mode 100755 index 000000000..327d716a1 --- /dev/null +++ b/.dbeaver/credentials-config.json @@ -0,0 +1 @@ +&l2ͻoSFA[礑o9c`Qo;ЎQxm7$ FU$e%xY5dh]ls7|\+P \ No newline at end of file diff --git a/.dbeaver/data-sources.json b/.dbeaver/data-sources.json new file mode 100755 index 000000000..13086939c --- /dev/null +++ b/.dbeaver/data-sources.json @@ -0,0 +1,29 @@ +{ + "folders": {}, + "connections": { + "mysql8-177f1df173f-2ff7634518f3a52d": { + "provider": "mysql", + "driver": "mysql8", + "name": "localhost", + "save-password": true, + "read-only": false, + "configuration": { + "host": "localhost", + "port": "3306", + "url": "jdbc:mysql://localhost:3306/", + "type": "dev", + "auth-model": "native" + } + } + }, + "connection-types": { + "dev": { + "name": "Development", + "color": "255,255,255", + "description": "Regular development database", + "auto-commit": true, + "confirm-execute": false, + "confirm-data-change": false + } + } +} \ No newline at end of file diff --git a/.project b/.project new file mode 100755 index 000000000..01430219b --- /dev/null +++ b/.project @@ -0,0 +1,46 @@ + + + PartUp + + + + + + com.dubture.doctrine.core.doctrineBuilder + + + + + com.dubture.symfony.core.symfonyBuilder + + + + + org.eclipse.php.composer.core.builder.buildPathManagementBuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.dltk.core.scriptbuilder + + + + + + org.jkiss.dbeaver.DBeaverNature + org.eclipse.php.core.PHPNature + org.eclipse.wst.common.project.facet.core.nature + com.dubture.symfony.core.symfonyNature + com.dubture.doctrine.core.doctrineNature + + diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs new file mode 100755 index 000000000..62cfd98d8 --- /dev/null +++ b/.settings/org.eclipse.php.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +include_path=0;/PartKeepr diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100755 index 000000000..8625df2bf --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100755 index 000000000..39a5ef641 --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06vendor +eclipse.preferences.version=1 diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php new file mode 100755 index 000000000..b21edde67 --- /dev/null +++ b/app/SymfonyRequirements.php @@ -0,0 +1,806 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +/* + * Users of PHP 5.2 should be able to run the requirements checks. + * This is why the file and all classes must be compatible with PHP 5.2+ + * (e.g. not using namespaces and closures). + * + * ************** CAUTION ************** + * + * DO NOT EDIT THIS FILE as it will be overridden by Composer as part of + * the installation/update process. The original file resides in the + * SensioDistributionBundle. + * + * ************** CAUTION ************** + */ + +/** + * Represents a single PHP requirement, e.g. an installed extension. + * It can be a mandatory requirement or an optional recommendation. + * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration. + * + * @author Tobias Schultze + */ +class Requirement +{ + private $fulfilled; + private $testMessage; + private $helpText; + private $helpHtml; + private $optional; + + /** + * Constructor that initializes the requirement. + * + * @param bool $fulfilled Whether the requirement is fulfilled + * @param string $testMessage The message for testing the requirement + * @param string $helpHtml The help text formatted in HTML for resolving the problem + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param bool $optional Whether this is only an optional recommendation not a mandatory requirement + */ + public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false) + { + $this->fulfilled = (bool) $fulfilled; + $this->testMessage = (string) $testMessage; + $this->helpHtml = (string) $helpHtml; + $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText; + $this->optional = (bool) $optional; + } + + /** + * Returns whether the requirement is fulfilled. + * + * @return bool true if fulfilled, otherwise false + */ + public function isFulfilled() + { + return $this->fulfilled; + } + + /** + * Returns the message for testing the requirement. + * + * @return string The test message + */ + public function getTestMessage() + { + return $this->testMessage; + } + + /** + * Returns the help text for resolving the problem. + * + * @return string The help text + */ + public function getHelpText() + { + return $this->helpText; + } + + /** + * Returns the help text formatted in HTML. + * + * @return string The HTML help + */ + public function getHelpHtml() + { + return $this->helpHtml; + } + + /** + * Returns whether this is only an optional recommendation and not a mandatory requirement. + * + * @return bool true if optional, false if mandatory + */ + public function isOptional() + { + return $this->optional; + } +} + +/** + * Represents a PHP requirement in form of a php.ini configuration. + * + * @author Tobias Schultze + */ +class PhpIniRequirement extends Requirement +{ + /** + * Constructor that initializes the requirement. + * + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param bool $optional Whether this is only an optional recommendation not a mandatory requirement + */ + public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false) + { + $cfgValue = ini_get($cfgName); + + if (is_callable($evaluation)) { + if (null === $testMessage || null === $helpHtml) { + throw new InvalidArgumentException('You must provide the parameters testMessage and helpHtml for a callback evaluation.'); + } + + $fulfilled = call_user_func($evaluation, $cfgValue); + } else { + if (null === $testMessage) { + $testMessage = sprintf('%s %s be %s in php.ini', + $cfgName, + $optional ? 'should' : 'must', + $evaluation ? 'enabled' : 'disabled' + ); + } + + if (null === $helpHtml) { + $helpHtml = sprintf('Set %s to %s in php.ini*.', + $cfgName, + $evaluation ? 'on' : 'off' + ); + } + + $fulfilled = $evaluation == $cfgValue; + } + + parent::__construct($fulfilled || ($approveCfgAbsence && false === $cfgValue), $testMessage, $helpHtml, $helpText, $optional); + } +} + +/** + * A RequirementCollection represents a set of Requirement instances. + * + * @author Tobias Schultze + */ +class RequirementCollection implements IteratorAggregate +{ + /** + * @var Requirement[] + */ + private $requirements = array(); + + /** + * Gets the current RequirementCollection as an Iterator. + * + * @return Traversable A Traversable interface + */ + public function getIterator() + { + return new ArrayIterator($this->requirements); + } + + /** + * Adds a Requirement. + * + * @param Requirement $requirement A Requirement instance + */ + public function add(Requirement $requirement) + { + $this->requirements[] = $requirement; + } + + /** + * Adds a mandatory requirement. + * + * @param bool $fulfilled Whether the requirement is fulfilled + * @param string $testMessage The message for testing the requirement + * @param string $helpHtml The help text formatted in HTML for resolving the problem + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null) + { + $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, false)); + } + + /** + * Adds an optional recommendation. + * + * @param bool $fulfilled Whether the recommendation is fulfilled + * @param string $testMessage The message for testing the recommendation + * @param string $helpHtml The help text formatted in HTML for resolving the problem + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null) + { + $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, true)); + } + + /** + * Adds a mandatory requirement in form of a php.ini configuration. + * + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) + { + $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, false)); + } + + /** + * Adds an optional recommendation in form of a php.ini configuration. + * + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) + { + $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, true)); + } + + /** + * Adds a requirement collection to the current set of requirements. + * + * @param RequirementCollection $collection A RequirementCollection instance + */ + public function addCollection(RequirementCollection $collection) + { + $this->requirements = array_merge($this->requirements, $collection->all()); + } + + /** + * Returns both requirements and recommendations. + * + * @return Requirement[] + */ + public function all() + { + return $this->requirements; + } + + /** + * Returns all mandatory requirements. + * + * @return Requirement[] + */ + public function getRequirements() + { + $array = array(); + foreach ($this->requirements as $req) { + if (!$req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns the mandatory requirements that were not met. + * + * @return Requirement[] + */ + public function getFailedRequirements() + { + $array = array(); + foreach ($this->requirements as $req) { + if (!$req->isFulfilled() && !$req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns all optional recommendations. + * + * @return Requirement[] + */ + public function getRecommendations() + { + $array = array(); + foreach ($this->requirements as $req) { + if ($req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns the recommendations that were not met. + * + * @return Requirement[] + */ + public function getFailedRecommendations() + { + $array = array(); + foreach ($this->requirements as $req) { + if (!$req->isFulfilled() && $req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns whether a php.ini configuration is not correct. + * + * @return bool php.ini configuration problem? + */ + public function hasPhpIniConfigIssue() + { + foreach ($this->requirements as $req) { + if (!$req->isFulfilled() && $req instanceof PhpIniRequirement) { + return true; + } + } + + return false; + } + + /** + * Returns the PHP configuration file (php.ini) path. + * + * @return string|false php.ini file path + */ + public function getPhpIniConfigPath() + { + return get_cfg_var('cfg_file_path'); + } +} + +/** + * This class specifies all requirements and optional recommendations that + * are necessary to run the Symfony Standard Edition. + * + * @author Tobias Schultze + * @author Fabien Potencier + */ +class SymfonyRequirements extends RequirementCollection +{ + const LEGACY_REQUIRED_PHP_VERSION = '5.3.3'; + const REQUIRED_PHP_VERSION = '5.5.9'; + + /** + * Constructor that initializes the requirements. + */ + public function __construct() + { + /* mandatory requirements follow */ + + $installedPhpVersion = phpversion(); + $requiredPhpVersion = $this->getPhpRequiredVersion(); + + $this->addRecommendation( + $requiredPhpVersion, + 'Vendors should be installed in order to check all requirements.', + 'Run the composer install command.', + 'Run the "composer install" command.' + ); + + if (false !== $requiredPhpVersion) { + $this->addRequirement( + version_compare($installedPhpVersion, $requiredPhpVersion, '>='), + sprintf('PHP version must be at least %s (%s installed)', $requiredPhpVersion, $installedPhpVersion), + sprintf('You are running PHP version "%s", but Symfony needs at least PHP "%s" to run. + Before using Symfony, upgrade your PHP installation, preferably to the latest version.', + $installedPhpVersion, $requiredPhpVersion), + sprintf('Install PHP %s or newer (installed version is %s)', $requiredPhpVersion, $installedPhpVersion) + ); + } + + $this->addRequirement( + version_compare($installedPhpVersion, '5.3.16', '!='), + 'PHP version must not be 5.3.16 as Symfony won\'t work properly with it', + 'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)' + ); + + $this->addRequirement( + is_dir(__DIR__.'/../vendor/composer'), + 'Vendor libraries must be installed', + 'Vendor libraries are missing. Install composer following instructions from http://getcomposer.org/. '. + 'Then run "php composer.phar install" to install them.' + ); + + $cacheDir = is_dir(__DIR__.'/../var/cache') ? __DIR__.'/../var/cache' : __DIR__.'/cache'; + + $this->addRequirement( + is_writable($cacheDir), + 'app/cache/ or var/cache/ directory must be writable', + 'Change the permissions of either "app/cache/" or "var/cache/" directory so that the web server can write into it.' + ); + + $logsDir = is_dir(__DIR__.'/../var/logs') ? __DIR__.'/../var/logs' : __DIR__.'/logs'; + + $this->addRequirement( + is_writable($logsDir), + 'app/logs/ or var/logs/ directory must be writable', + 'Change the permissions of either "app/logs/" or "var/logs/" directory so that the web server can write into it.' + ); + + $this->addPhpIniRequirement( + 'date.timezone', true, false, + 'date.timezone setting must be set', + 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).' + ); + + if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) { + $timezones = array(); + foreach (DateTimeZone::listAbbreviations() as $abbreviations) { + foreach ($abbreviations as $abbreviation) { + $timezones[$abbreviation['timezone_id']] = true; + } + } + + $this->addRequirement( + isset($timezones[@date_default_timezone_get()]), + sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()), + 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' + ); + } + + $this->addRequirement( + function_exists('iconv'), + 'iconv() must be available', + 'Install and enable the iconv extension.' + ); + + $this->addRequirement( + function_exists('json_encode'), + 'json_encode() must be available', + 'Install and enable the JSON extension.' + ); + + $this->addRequirement( + function_exists('session_start'), + 'session_start() must be available', + 'Install and enable the session extension.' + ); + + $this->addRequirement( + function_exists('ctype_alpha'), + 'ctype_alpha() must be available', + 'Install and enable the ctype extension.' + ); + + $this->addRequirement( + function_exists('token_get_all'), + 'token_get_all() must be available', + 'Install and enable the Tokenizer extension.' + ); + + $this->addRequirement( + function_exists('simplexml_import_dom'), + 'simplexml_import_dom() must be available', + 'Install and enable the SimpleXML extension.' + ); + + if (function_exists('apc_store') && ini_get('apc.enabled')) { + if (version_compare($installedPhpVersion, '5.4.0', '>=')) { + $this->addRequirement( + version_compare(phpversion('apc'), '3.1.13', '>='), + 'APC version must be at least 3.1.13 when using PHP 5.4', + 'Upgrade your APC extension (3.1.13+).' + ); + } else { + $this->addRequirement( + version_compare(phpversion('apc'), '3.0.17', '>='), + 'APC version must be at least 3.0.17', + 'Upgrade your APC extension (3.0.17+).' + ); + } + } + + $this->addPhpIniRequirement('detect_unicode', false); + + if (extension_loaded('suhosin')) { + $this->addPhpIniRequirement( + 'suhosin.executor.include.whitelist', + create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), + false, + 'suhosin.executor.include.whitelist must be configured correctly in php.ini', + 'Add "phar" to suhosin.executor.include.whitelist in php.ini*.' + ); + } + + if (extension_loaded('xdebug')) { + $this->addPhpIniRequirement( + 'xdebug.show_exception_trace', false, true + ); + + $this->addPhpIniRequirement( + 'xdebug.scream', false, true + ); + + $this->addPhpIniRecommendation( + 'xdebug.max_nesting_level', + create_function('$cfgValue', 'return $cfgValue > 100;'), + true, + 'xdebug.max_nesting_level should be above 100 in php.ini', + 'Set "xdebug.max_nesting_level" to e.g. "250" in php.ini* to stop Xdebug\'s infinite recursion protection erroneously throwing a fatal error in your project.' + ); + } + + $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null; + + $this->addRequirement( + null !== $pcreVersion, + 'PCRE extension must be available', + 'Install the PCRE extension (version 8.0+).' + ); + + if (extension_loaded('mbstring')) { + $this->addPhpIniRequirement( + 'mbstring.func_overload', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'string functions should not be overloaded', + 'Set "mbstring.func_overload" to 0 in php.ini* to disable function overloading by the mbstring extension.' + ); + } + + /* optional recommendations follow */ + + if (file_exists(__DIR__.'/../vendor/composer')) { + require_once __DIR__.'/../vendor/autoload.php'; + + try { + $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); + } catch (ReflectionException $e) { + $contents = ''; + } + $this->addRecommendation( + file_get_contents(__FILE__) === $contents, + 'Requirements file should be up-to-date', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' + ); + } + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.3.4', '>='), + 'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions', + 'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.' + ); + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.3.8', '>='), + 'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156', + 'Install PHP 5.3.8 or newer if your project uses annotations.' + ); + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.4.0', '!='), + 'You should not use PHP 5.4.0 due to the PHP bug #61453', + 'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.' + ); + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.4.11', '>='), + 'When using the logout handler from the Symfony Security Component, you should have at least PHP 5.4.11 due to PHP bug #63379 (as a workaround, you can also set invalidate_session to false in the security logout handler configuration)', + 'Install PHP 5.4.11 or newer if your project uses the logout handler from the Symfony Security Component.' + ); + + $this->addRecommendation( + (version_compare($installedPhpVersion, '5.3.18', '>=') && version_compare($installedPhpVersion, '5.4.0', '<')) + || + version_compare($installedPhpVersion, '5.4.8', '>='), + 'You should use PHP 5.3.18+ or PHP 5.4.8+ to always get nice error messages for fatal errors in the development environment due to PHP bug #61767/#60909', + 'Install PHP 5.3.18+ or PHP 5.4.8+ if you want nice error messages for all fatal errors in the development environment.' + ); + + if (null !== $pcreVersion) { + $this->addRecommendation( + $pcreVersion >= 8.0, + sprintf('PCRE extension should be at least version 8.0 (%s installed)', $pcreVersion), + 'PCRE 8.0+ is preconfigured in PHP since 5.3.2 but you are using an outdated version of it. Symfony probably works anyway but it is recommended to upgrade your PCRE extension.' + ); + } + + $this->addRecommendation( + class_exists('DomDocument'), + 'PHP-DOM and PHP-XML modules should be installed', + 'Install and enable the PHP-DOM and the PHP-XML modules.' + ); + + $this->addRecommendation( + function_exists('mb_strlen'), + 'mb_strlen() should be available', + 'Install and enable the mbstring extension.' + ); + + $this->addRecommendation( + function_exists('iconv'), + 'iconv() should be available', + 'Install and enable the iconv extension.' + ); + + $this->addRecommendation( + function_exists('utf8_decode'), + 'utf8_decode() should be available', + 'Install and enable the XML extension.' + ); + + $this->addRecommendation( + function_exists('filter_var'), + 'filter_var() should be available', + 'Install and enable the filter extension.' + ); + + if (!defined('PHP_WINDOWS_VERSION_BUILD')) { + $this->addRecommendation( + function_exists('posix_isatty'), + 'posix_isatty() should be available', + 'Install and enable the php_posix extension (used to colorize the CLI output).' + ); + } + + $this->addRecommendation( + extension_loaded('intl'), + 'intl extension should be available', + 'Install and enable the intl extension (used for validators).' + ); + + if (extension_loaded('intl')) { + // in some WAMP server installations, new Collator() returns null + $this->addRecommendation( + null !== new Collator('fr_FR'), + 'intl extension should be correctly configured', + 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.' + ); + + // check for compatible ICU versions (only done when you have the intl extension) + if (defined('INTL_ICU_VERSION')) { + $version = INTL_ICU_VERSION; + } else { + $reflector = new ReflectionExtension('intl'); + + ob_start(); + $reflector->info(); + $output = strip_tags(ob_get_clean()); + + preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches); + $version = $matches[1]; + } + + $this->addRecommendation( + version_compare($version, '4.0', '>='), + 'intl ICU version should be at least 4+', + 'Upgrade your intl extension with a newer ICU version (4+).' + ); + + $this->addPhpIniRecommendation( + 'intl.error_level', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'intl.error_level should be 0 in php.ini', + 'Set "intl.error_level" to "0" in php.ini* to inhibit the messages when an error occurs in ICU functions.' + ); + } + + $accelerator = + (extension_loaded('eaccelerator') && ini_get('eaccelerator.enable')) + || + (extension_loaded('apc') && ini_get('apc.enabled')) + || + (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable')) + || + (extension_loaded('Zend OPcache') && ini_get('opcache.enable')) + || + (extension_loaded('xcache') && ini_get('xcache.cacher')) + || + (extension_loaded('wincache') && ini_get('wincache.ocenabled')) + ; + + $this->addRecommendation( + $accelerator, + 'a PHP accelerator should be installed', + 'Install and/or enable a PHP accelerator (highly recommended).' + ); + + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $this->addRecommendation( + $this->getRealpathCacheSize() >= 5 * 1024 * 1024, + 'realpath_cache_size should be at least 5M in php.ini', + 'Setting "realpath_cache_size" to e.g. "5242880" or "5M" in php.ini* may improve performance on Windows significantly in some cases.' + ); + } + + $this->addPhpIniRecommendation('short_open_tag', false); + + $this->addPhpIniRecommendation('magic_quotes_gpc', false, true); + + $this->addPhpIniRecommendation('register_globals', false, true); + + $this->addPhpIniRecommendation('session.auto_start', false); + + $this->addRecommendation( + class_exists('PDO'), + 'PDO should be installed', + 'Install PDO (mandatory for Doctrine).' + ); + + if (class_exists('PDO')) { + $drivers = PDO::getAvailableDrivers(); + $this->addRecommendation( + count($drivers) > 0, + sprintf('PDO should have some drivers installed (currently available: %s)', count($drivers) ? implode(', ', $drivers) : 'none'), + 'Install PDO drivers (mandatory for Doctrine).' + ); + } + } + + /** + * Loads realpath_cache_size from php.ini and converts it to int. + * + * (e.g. 16k is converted to 16384 int) + * + * @return int + */ + protected function getRealpathCacheSize() + { + $size = ini_get('realpath_cache_size'); + $size = trim($size); + $unit = ''; + if (!ctype_digit($size)) { + $unit = strtolower(substr($size, -1, 1)); + $size = (int) substr($size, 0, -1); + } + switch ($unit) { + case 'g': + return $size * 1024 * 1024 * 1024; + case 'm': + return $size * 1024 * 1024; + case 'k': + return $size * 1024; + default: + return (int) $size; + } + } + + /** + * Defines PHP required version from Symfony version. + * + * @return string|false The PHP required version or false if it could not be guessed + */ + protected function getPhpRequiredVersion() + { + if (!file_exists($path = __DIR__.'/../composer.lock')) { + return false; + } + + $composerLock = json_decode(file_get_contents($path), true); + foreach ($composerLock['packages'] as $package) { + $name = $package['name']; + if ('symfony/symfony' !== $name && 'symfony/http-kernel' !== $name) { + continue; + } + + return (int) $package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION; + } + + return false; + } +} diff --git a/app/check.php b/app/check.php new file mode 100755 index 000000000..c6e5a877e --- /dev/null +++ b/app/check.php @@ -0,0 +1,141 @@ +getPhpIniConfigPath(); + +echo_title('Symfony Requirements Checker'); + +echo '> PHP is using the following php.ini file:'.PHP_EOL; +if ($iniPath) { + echo_style('green', ' '.$iniPath); +} else { + echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!'); +} + +echo PHP_EOL.PHP_EOL; + +echo '> Checking Symfony requirements:'.PHP_EOL.' '; + +$messages = array(); +foreach ($symfonyRequirements->getRequirements() as $req) { + if ($helpText = get_error_message($req, $lineSize)) { + echo_style('red', 'E'); + $messages['error'][] = $helpText; + } else { + echo_style('green', '.'); + } +} + +$checkPassed = empty($messages['error']); + +foreach ($symfonyRequirements->getRecommendations() as $req) { + if ($helpText = get_error_message($req, $lineSize)) { + echo_style('yellow', 'W'); + $messages['warning'][] = $helpText; + } else { + echo_style('green', '.'); + } +} + +if ($checkPassed) { + echo_block('success', 'OK', 'Your system is ready to run Symfony projects'); +} else { + echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects'); + + echo_title('Fix the following mandatory requirements', 'red'); + + foreach ($messages['error'] as $helpText) { + echo ' * '.$helpText.PHP_EOL; + } +} + +if (!empty($messages['warning'])) { + echo_title('Optional recommendations to improve your setup', 'yellow'); + + foreach ($messages['warning'] as $helpText) { + echo ' * '.$helpText.PHP_EOL; + } +} + +echo PHP_EOL; +echo_style('title', 'Note'); +echo ' The command console could use a different php.ini file'.PHP_EOL; +echo_style('title', '~~~~'); +echo ' than the one used with your web server. To be on the'.PHP_EOL; +echo ' safe side, please check the requirements from your web'.PHP_EOL; +echo ' server using the '; +echo_style('yellow', 'web/config.php'); +echo ' script.'.PHP_EOL; +echo PHP_EOL; + +exit($checkPassed ? 0 : 1); + +function get_error_message(Requirement $requirement, $lineSize) +{ + if ($requirement->isFulfilled()) { + return; + } + + $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; + $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; + + return $errorMessage; +} + +function echo_title($title, $style = null) +{ + $style = $style ?: 'title'; + + echo PHP_EOL; + echo_style($style, $title.PHP_EOL); + echo_style($style, str_repeat('~', strlen($title)).PHP_EOL); + echo PHP_EOL; +} + +function echo_style($style, $message) +{ + // ANSI color codes + $styles = array( + 'reset' => "\033[0m", + 'red' => "\033[31m", + 'green' => "\033[32m", + 'yellow' => "\033[33m", + 'error' => "\033[37;41m", + 'success' => "\033[37;42m", + 'title' => "\033[34m", + ); + $supports = has_color_support(); + + echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : ''); +} + +function echo_block($style, $title, $message) +{ + $message = ' '.trim($message).' '; + $width = strlen($message); + + echo PHP_EOL.PHP_EOL; + + echo_style($style, str_repeat(' ', $width).PHP_EOL); + echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_repeat(' ', $width).PHP_EOL); +} + +function has_color_support() +{ + static $support; + + if (null === $support) { + if (DIRECTORY_SEPARATOR == '\\') { + $support = false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI'); + } else { + $support = function_exists('posix_isatty') && @posix_isatty(STDOUT); + } + } + + return $support; +} From 3ff4e3772f8c8c3cc642331652ac81d69f536b51 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 18:46:02 +0200 Subject: [PATCH 002/140] calcoen - custom fields - Part table --- .../js/Components/Part/Editor/PartEditor.js | 43 ++++- .../Part/Editor/PartEditorWindow.js | 20 ++- .../public/js/Components/Part/PartInfoGrid.js | 15 ++ src/PartKeepr/PartBundle/Entity/Part.php | 164 ++++++++++++++++++ 4 files changed, 235 insertions(+), 7 deletions(-) diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js index ee6b0b6b6..99bb3d7f1 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js @@ -19,8 +19,19 @@ Ext.define('PartKeepr.PartEditor', { */ initComponent: function () { - // Defines the overall height of all fields, used to calculate the anchoring for the description field - var overallHeight = (this.partMode == "create") ? 320: 265; +/* DANIEL DANIEL DANIEL DANIEL DANIEL ToDo: fix the comment in the master, say wrongly "decription" while is for "comment"*/ + + // Defines the overall height of all fields, used to calculate the anchoring for the comment field +// var overallHeight = (this.partMode == "create") ? 320: 265; +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ +/* +435 total = 265 + 170 (comment 4 rows) 42.5 points per row +500 total = 320 + 180 (comment 4 rows) 45 points per row + +575 - 170 -> 405 +620 - 170 -> 450 +*/ + var overallHeight = (this.partMode == "create") ? 450: 405; this.nameField = Ext.create("Ext.form.field.Text", { name: 'name', @@ -216,7 +227,35 @@ Ext.define('PartKeepr.PartEditor', { } ] + } +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ + , { + xtype: 'textfield', + fieldLabel: i18n("Presentation"), + name: 'partPresentation', + allowBlank: this.isOptional("partPresentation"), + } , { + xtype: 'textfield', + fieldLabel: i18n("Code Manufacturer"), + name: 'partCodeManufacturer', + allowBlank: this.isOptional("partCodeManufacturer"), + } , { + xtype: 'textfield', + fieldLabel: i18n("Code Supplier"), + name: 'partCodeSupplier', + allowBlank: this.isOptional("partCodeSupplier"), + } , { + xtype: 'textfield', + fieldLabel: i18n("Code Additional"), + name: 'partCodeAdditional', + allowBlank: this.isOptional("partCodeAdditional"), + } , { + xtype: 'textfield', + fieldLabel: i18n("CERN project"), + name: 'partCERNproject', + allowBlank: this.isOptional("partCERNproject"), } +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ ]; // Creates the distributor grid diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditorWindow.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditorWindow.js index f99befb4d..48b5cae2a 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditorWindow.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditorWindow.js @@ -15,8 +15,11 @@ Ext.define('PartKeepr.PartEditorWindow', { /* Width and height settings */ width: 750, minWidth: 600, - minHeight: 435, - height: 435, +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ +// minHeight: 435, +// height: 435, + minHeight: 575, + height: 575, saveText: i18n("Save"), cancelText: i18n("Cancel"), @@ -39,9 +42,12 @@ Ext.define('PartKeepr.PartEditorWindow', { }); /* If the edit mode is "create", we need to enlarge the window a bit to fit the fields without scrolling */ +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ if (this.partMode && this.partMode == "create") { - this.height = 500; - this.minHeight = 500; +// this.height = 500; +// this.minHeight = 500; + this.height = 620; + this.minHeight = 620; } this.items = [this.editor]; @@ -140,7 +146,11 @@ Ext.define('PartKeepr.PartEditorWindow', { this.octoPartQueryWindow = Ext.create("PartKeepr.Components.OctoPart.SearchWindow"); this.octoPartQueryWindow.show(); this.octoPartQueryWindow.setPart(this.editor.record); - this.octoPartQueryWindow.startSearch(this.editor.nameField.getValue()); + // don't autosearch octo for empty name + let name = this.editor.nameField.getValue(); + if (name !== "") + this.octoPartQueryWindow.startSearch(name); +// this.octoPartQueryWindow.startSearch(this.editor.nameField.getValue()); this.octoPartQueryWindow.on("refreshData", this.onRefreshData, this); } else { Ext.MessageBox.alert(i18n("Octopart is not configured"), i18n("Your administrator needs to configure the API key for Octopart in the parameters.php file - see parameters.php.dist for instructions")); diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartInfoGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartInfoGrid.js index b50663ae9..c558bb528 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartInfoGrid.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartInfoGrid.js @@ -22,6 +22,21 @@ Ext.define("PartKeepr.Components.Part.PartInfoGrid", { comment: { displayName: i18n("Comment") }, +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ + partCodeManufacturer: { + displayName: i18n("Code Manufacturer") + }, + partCodeSupplier: { + displayName: i18n("Code Supplier") + }, + partCodeAdditional: { + displayName: i18n("Code Additional") + }, + partCERNproject: { + displayName: i18n("Project") + }, + +/* DANIEL DANIEL DANIEL DANIEL DANIEL */ createDate: { displayName: i18n("Create Date"), type: 'date' diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index d24be9f3f..0ebda3a22 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -297,7 +297,63 @@ class Part extends BaseEntity * @var array */ private $metaPartMatches; + + /* + * DANIEL DANIEL DANIEL DANIEL DANIEL + */ + + /** + * The partPresentation + * + * @ORM\Column(type="string",nullable=true) + * @Groups({"default"}) + * + * @var string + */ + private $partPresentation; + /** + * The partCodeManufacturer + * + * @ORM\Column(type="string",nullable=true) + * @Groups({"default"}) + * + * @var string + */ + private $partCodeManufacturer; + + /** + * The partCodeSupplier + * + * @ORM\Column(type="string",nullable=true) + * @Groups({"default"}) + * + * @var string + */ + private $partCodeSupplier; + /** + * The partCodeAdditional + * + * @ORM\Column(type="string",nullable=true) + * @Groups({"default"}) + * + * @var string + */ + private $partCodeAdditional; + /** + * The partCERNproject + * + * @ORM\Column(type="string",nullable=true) + * @Groups({"default"}) + * + * @var string + */ + private $partCERNproject; + + /* + * DANIEL DANIEL DANIEL DANIEL DANIEL + */ + public function __construct() { $this->distributors = new ArrayCollection(); @@ -1057,4 +1113,112 @@ public function setStockLevel($stockLevel) { $this->stockLevel = $stockLevel; } + + /* + * DANIEL DANIEL DANIEL DANIEL DANIEL + */ + /** + * Returns the partPresentation of this part. + * + * @return string The partPresentation + */ + public function getpartPresentation() + { + return $this->partPresentation; + } + + /** + * Sets the partPresentation for this part. + * + * @param string $partPresentation The partPresentation + */ + public function setpartPresentation($partPresentation) + { + $this->partPresentation = $partPresentation; + } + + /** + * Returns the partCodeManufacturer of this part. + * + * @return string The partCodeManufacturer + */ + public function getPartCodeManufacturer() + { + return $this->partCodeManufacturer; + } + + /** + * Sets the partCodeManufacturer for this part. + * + * @param string $partCodeManufacturer The partCodeManufacturer + */ + public function setPartCodeManufacturer($partCodeManufacturer) + { + $this->partCodeManufacturer = $partCodeManufacturer; + } + + /** + * Returns the partCodeSupplier of this part. + * + * @return string The partCodeSupplier + */ + public function getPartCodeSupplier() + { + return $this->partCodeSupplier; + } + + /** + * Sets the partCodeSupplier for this part. + * + * @param string $partCodeSupplier The partCodeSupplier + */ + public function setPartCodeSupplier($partCodeSupplier) + { + $this->partCodeSupplier = $partCodeSupplier; + } + + /** + * Returns the partCodeAdditional of this part. + * + * @return string The partCodeAdditional + */ + public function getPartCodeAdditional() + { + return $this->partCodeAdditional; + } + + /** + * Sets the partCodeAdditional for this part. + * + * @param string $partCodeAdditional The partCodeAdditional + */ + public function setPartCodeAdditional($partCodeAdditional) + { + $this->partCodeAdditional = $partCodeAdditional; + } + + /** + * Returns the partCERNproject of this part. + * + * @return string The partCERNproject + */ + public function getPartCERNproject() + { + return $this->partCERNproject; + } + + /** + * Sets the partCERNproject for this part. + * + * @param string $partCERNproject The partCERNproject + */ + public function setPartCERNproject($partCERNproject) + { + $this->partCERNproject = $partCERNproject; + } + + /* + * DANIEL DANIEL DANIEL DANIEL DANIEL + */ + } From 72221a7bf8d2b9452416d0bb8e71fd548565046e Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 18:50:08 +0200 Subject: [PATCH 003/140] fix barcode action not shown --- .../Preferences/BarcodeScannerConfiguration.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/BarcodeScannerConfiguration.js diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/BarcodeScannerConfiguration.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/BarcodeScannerConfiguration.js old mode 100644 new mode 100755 index 6e872289c..c8b5b3764 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/BarcodeScannerConfiguration.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/BarcodeScannerConfiguration.js @@ -77,10 +77,10 @@ Ext.define('PartKeepr.Components.SystemPreferences.Preferences.BarcodeScannerCon }, { text: i18n("Action"), dataIndex: 'action', flex: 1, - renderer: function (v) + renderer: function (v, m, record) { - if (v instanceof Ext.data.Model) { - return v.get("name"); + if (record.get("action") instanceof Ext.data.Model) { + return record.get("action").get("name"); } else { return i18n("No action selected"); } From d320b788ccaf8ec4b680c9e4094342ff196cd950 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 18:51:24 +0200 Subject: [PATCH 004/140] fix action delete button no handler issue partkeepr#1202 --- .../Preferences/ActionsConfiguration.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/ActionsConfiguration.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/ActionsConfiguration.js index b4229e59f..185cd0ee6 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/ActionsConfiguration.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/SystemPreferences/Preferences/ActionsConfiguration.js @@ -86,8 +86,10 @@ Ext.define('PartKeepr.Components.SystemPreferences.Preferences.ActionsConfigurat xtype: 'button', text: i18n("Delete Action"), disabled: true, - itemId: 'actionDelete' - } + itemId: 'actionDelete', + handler: this.onDeleteClick, + scope: this + } ] } ] @@ -125,6 +127,11 @@ Ext.define('PartKeepr.Components.SystemPreferences.Preferences.ActionsConfigurat grid.getPlugin("editing").startEdit(0, 0); }, + onDeleteClick: function () + { + var grid = this.down("#actionGrid"); + grid.getStore().remove(grid.getView().getSelectionModel().getSelection()); + }, onSelectionChange: function (grid, selection) { if (selection.length === 1) { From fe0c3af65916bec34c175d024ec2c2211440e52e Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 18:54:43 +0200 Subject: [PATCH 005/140] Revert max value limitation. Negative stock values are allowed/expected behavior in some circumstances. --- .../js/Components/Part/PartStockWindow.js | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartStockWindow.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartStockWindow.js index 27a10bfb5..6590aec3b 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartStockWindow.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartStockWindow.js @@ -160,11 +160,33 @@ Ext.define('PartKeepr.PartStockWindow', { } else { price = this.priceField.getValue() / this.quantityField.getValue(); } - - Ext.callback(this.callbackFn, - this.callbackScope, - [this.quantityField.getValue(), price, this.commentField.getValue()]); - this.close(); + + //Warn the user if they want to remove more than the current available + var current_stock = this.callbackScope.record.data.stockLevel; + if ((this.title == this.removePartText) & (this.quantityField.getValue() > current_stock)){ + + Ext.Msg.confirm(i18n("Not enough stock"), + i18n("You are removing more parts than are in stock. \ + If you continue a negative stock will be tracked.

\ + Are you sure you want to remove these parts?"), + function(buttonid){ + // if yes, submit data as normal + if (buttonid == "yes") { + Ext.callback(this.callbackFn, + this.callbackScope, + [this.quantityField.getValue(), price, this.commentField.getValue()]); + this.close(); + } + return; //otherwise, return without doing anything + }, this); + } + else { // add or remove stock normally + + Ext.callback(this.callbackFn, + this.callbackScope, + [this.quantityField.getValue(), price, this.commentField.getValue()]); + this.close(); + } } }, /** @@ -201,7 +223,10 @@ Ext.define('PartKeepr.PartStockWindow', { this.priceField.hide(); this.priceCheckbox.hide(); this.okButton.setIconCls("web-icon brick_delete"); - this.quantityField.maxValue = this.callbackScope.record.data.stockLevel; + +// Revert max value limitation. Negative stock values are allowed/expected behavior in some circumstances. +// this.quantityField.maxValue = this.callbackScope.record.data.stockLevel; + this.show(); } }); From ede82d552e86f7256de525eb71463c11c420f3c4 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 19:05:45 +0200 Subject: [PATCH 006/140] update replaceFromURL's user-agent to avoid TI ban #1165 --- .../UploadedFileBundle/Services/UploadedFileService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php b/src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php index 1d199d3e2..d22b8074a 100644 --- a/src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php +++ b/src/PartKeepr/UploadedFileBundle/Services/UploadedFileService.php @@ -134,8 +134,8 @@ public function replaceFromURL(UploadedFile $file, $url) $header[] = 'Accept-Language: en-us,en;q=0.5'; $header[] = 'Pragma: '; - $browser = 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.3) Gecko/2008092510 '; - $browser .= 'Ubuntu/8.04 (hardy) Firefox/3.0.3'; + $browser = 'Mozilla/5.0 (X11; Linux x86_64; rv:83.0) '; + $browser .= 'Gecko/20100101 Firefox/83.0'; curl_setopt($curl, CURLOPT_URL, $url); curl_setopt($curl, CURLOPT_USERAGENT, $browser); From 246fc11d54410672c6231eb0de073399d667524e Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 3 Apr 2021 19:53:45 +0200 Subject: [PATCH 007/140] Show errors from Octopart search --- .../Resources/public/js/Components/OctoPart/SearchPanel.js | 2 +- src/PartKeepr/OctoPartBundle/Services/OctoPartService.php | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/OctoPart/SearchPanel.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/OctoPart/SearchPanel.js index 1f146f572..ce5968761 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/OctoPart/SearchPanel.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/OctoPart/SearchPanel.js @@ -206,7 +206,7 @@ Ext.define("PartKeepr.Components.OctoPart.SearchPanel", { }, checkForErrors: function (data) { - if (data.results.length == 0 && data.errors.length > 0) { + if (data.errors && data.errors.length > 0) { Ext.Msg.alert(i18n("Octopart Error"), data.errors.map(e => e.message).join()); } diff --git a/src/PartKeepr/OctoPartBundle/Services/OctoPartService.php b/src/PartKeepr/OctoPartBundle/Services/OctoPartService.php index 81cb1ff94..0343735e0 100644 --- a/src/PartKeepr/OctoPartBundle/Services/OctoPartService.php +++ b/src/PartKeepr/OctoPartBundle/Services/OctoPartService.php @@ -55,9 +55,6 @@ class OctoPartService credit_string text } - cad { - add_to_library_url - } reference_designs { name url @@ -137,9 +134,6 @@ class OctoPartService credit_string text } - cad { - add_to_library_url - } reference_designs { name url From 1f0dc3476fcf098da7f7ee59598bb45f431c4a61 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 4 Apr 2021 09:46:49 +0200 Subject: [PATCH 008/140] comment out github workflow --- .github/workflows/docker.yml | 106 +++++++++++++++---------------- .github/workflows/notify_irc.yml | 70 ++++++++++---------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f302e8fc9..d4d7e6284 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,54 +1,54 @@ -name: Docker Image Creation - -on: - push: - branches: - - master - tags: - - '**' - -jobs: - - base-image: - - runs-on: ubuntu-latest - name: Create the base image - - steps: - - uses: actions/checkout@v2 - - name: Fetch git tags - run: git fetch --unshallow origin +refs/tags/*:refs/tags/* - - - name: Build the base docker image - run: docker pull partkeepr/base-dev:latest && docker build docker/base-dev --file docker/base-dev/Dockerfile --cache-from partkeepr/base-dev:latest --tag partkeepr/base-dev:latest - - name: Tag the base docker image with git hash - run: docker tag partkeepr/base-dev:latest partkeepr/base-dev:$(git describe) - - name: Deploy the base docker images - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }} - docker push partkeepr/base-dev:latest - docker push partkeepr/base-dev:$(git describe) - - development-image: - - runs-on: ubuntu-latest - needs: base-image - name: Create the development image - - steps: - - uses: actions/checkout@v2 - - name: Fetch git tags - run: git fetch --unshallow origin +refs/tags/*:refs/tags/* - - - name: Build development image - run: | - docker pull partkeepr/development:latest - docker build docker/development/app --file docker/development/app/Dockerfile --tag partkeepr/development:latest --build-arg SRC_IMAGE=partkeepr/base-dev:$(git describe) --cache-from partkeepr/development:latest - - name: Tag the development docker image with git hash - run: docker tag partkeepr/development:latest partkeepr/development:$(git describe) - - name: Deploy the development docker images - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }} - docker push partkeepr/development:latest - docker push partkeepr/development:$(git describe) +#name: Docker Image Creation +# +#on: +# push: +# branches: +# - master +# tags: +# - '**' +# +#jobs: +# +# base-image: +# +# runs-on: ubuntu-latest +# name: Create the base image +# +# steps: +# - uses: actions/checkout@v2 +# - name: Fetch git tags +# run: git fetch --unshallow origin +refs/tags/*:refs/tags/* +# +# - name: Build the base docker image +# run: docker pull partkeepr/base-dev:latest && docker build docker/base-dev --file docker/base-dev/Dockerfile --cache-from partkeepr/base-dev:latest --tag partkeepr/base-dev:latest +# - name: Tag the base docker image with git hash +# run: docker tag partkeepr/base-dev:latest partkeepr/base-dev:$(git describe) +# - name: Deploy the base docker images +# run: | +# docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }} +# docker push partkeepr/base-dev:latest +# docker push partkeepr/base-dev:$(git describe) +# +# development-image: +# +# runs-on: ubuntu-latest +# needs: base-image +# name: Create the development image +# +# steps: +# - uses: actions/checkout@v2 +# - name: Fetch git tags +# run: git fetch --unshallow origin +refs/tags/*:refs/tags/* +# +# - name: Build development image +# run: | +# docker pull partkeepr/development:latest +# docker build docker/development/app --file docker/development/app/Dockerfile --tag partkeepr/development:latest --build-arg SRC_IMAGE=partkeepr/base-dev:$(git describe) --cache-from partkeepr/development:latest +# - name: Tag the development docker image with git hash +# run: docker tag partkeepr/development:latest partkeepr/development:$(git describe) +# - name: Deploy the development docker images +# run: | +# docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }} +# docker push partkeepr/development:latest +# docker push partkeepr/development:$(git describe) diff --git a/.github/workflows/notify_irc.yml b/.github/workflows/notify_irc.yml index a5106ba03..f83b3420c 100644 --- a/.github/workflows/notify_irc.yml +++ b/.github/workflows/notify_irc.yml @@ -1,35 +1,35 @@ -name: "Push Notification" -on: [push, pull_request, create] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: irc push - uses: rectalogic/notify-irc@v1 - if: github.event_name == 'push' - with: - channel: "#partkeepr" - nickname: PartKeepr - password: ${{ secrets.FREENODE_PASSWORD }} - message: | - ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} - ${{ join(github.event.commits.*.message) }} - - name: irc pull request - uses: rectalogic/notify-irc@v1 - if: github.event_name == 'pull_request' - with: - channel: "#partkeepr" - nickname: PartKeepr - password: ${{ secrets.FREENODE_PASSWORD }} - message: | - ${{ github.actor }} opened PR ${{ github.event.html_url }} - - name: irc tag created - uses: rectalogic/notify-irc@v1 - if: github.event_name == 'create' && github.event.ref_type == 'tag' - with: - channel: "#partkeepr" - nickname: PartKeepr - password: ${{ secrets.FREENODE_PASSWORD }} - message: | - ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }} +# name: "Push Notification" +# on: [push, pull_request, create] +# +# jobs: +# test: +# runs-on: ubuntu-latest +# steps: +# - name: irc push +# uses: rectalogic/notify-irc@v1 +# if: github.event_name == 'push' +# with: +# channel: "#partkeepr" +# nickname: PartKeepr +# password: ${{ secrets.FREENODE_PASSWORD }} +# message: | +# ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} +# ${{ join(github.event.commits.*.message) }} +# - name: irc pull request +# uses: rectalogic/notify-irc@v1 +# if: github.event_name == 'pull_request' +# with: +# channel: "#partkeepr" +# nickname: PartKeepr +# password: ${{ secrets.FREENODE_PASSWORD }} +# message: | +# ${{ github.actor }} opened PR ${{ github.event.html_url }} +# - name: irc tag created +# uses: rectalogic/notify-irc@v1 +# if: github.event_name == 'create' && github.event.ref_type == 'tag' +# with: +# channel: "#partkeepr" +# nickname: PartKeepr +# password: ${{ secrets.FREENODE_PASSWORD }} +# message: | +# ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }} From 13e85686caf7d8c17a39c1beaceb297ebbde1397 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Apr 2021 22:07:19 +0200 Subject: [PATCH 009/140] add the v to some number to have the exact tag --- composer.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index bbb0e6254..5c0e858bc 100644 --- a/composer.json +++ b/composer.json @@ -39,37 +39,37 @@ } ], "require": { - "php": ">=5.6.0", + "php": "7.1.33", "atelierspierrot/famfamfam-silk-sprite": "1.0.0", "brainbits/fugue-icons-bundle": "3.5.6", "doctrine/doctrine-bundle": "1.10.3", - "doctrine/doctrine-fixtures-bundle": "2.4.1", - "doctrine/doctrine-migrations-bundle": "1.3.2", - "doctrine/migrations": "1.2.2", - "doctrine/orm": "2.5.14", + "doctrine/doctrine-fixtures-bundle": "v2.4.1", + "doctrine/doctrine-migrations-bundle": "v1.3.2", + "doctrine/migrations": "v1.2.2", + "doctrine/orm": "v2.5.14", "fortawesome/font-awesome": "5.15.1", "friendsofsymfony/rest-bundle": "1.7.7", - "friendsofsymfony/user-bundle": "2.1.2", + "friendsofsymfony/user-bundle": "v2.1.2", "guzzlehttp/guzzle": "6.5.5", "imagine/imagine": "1.2.4", - "incenteev/composer-parameter-handler": "2.1.4", - "knplabs/knp-gaufrette-bundle": "0.5.3", + "incenteev/composer-parameter-handler": "v2.1.4", + "knplabs/knp-gaufrette-bundle": "v0.5.3", "phpseclib/phpseclib": "2.0.30", - "predis/predis": "1.1.6", + "predis/predis": "v1.1.6", "ramsey/uuid": "3.9.3", "reputation-vip/composer-assets-installer": "1.0.4", - "sensio/distribution-bundle": "4.0.42", - "sensio/framework-extra-bundle": "3.0.29", + "sensio/distribution-bundle": "v4.0.42", + "sensio/framework-extra-bundle": "v3.0.29", "sonata-project/exporter": "1.7.1", "snc/redis-bundle": "2.1.13", - "stof/doctrine-extensions-bundle": "1.3", - "symfony/assetic-bundle": "2.8.2", - "symfony/monolog-bundle": "3.3.1", - "symfony/property-access": "2.8.52", - "symfony/swiftmailer-bundle": "3.0.3", - "symfony/symfony": "2.8.52", - "twig/extensions": "1.5.4", - "twig/twig": "1.42.2", + "stof/doctrine-extensions-bundle": "v1.3.0", + "symfony/assetic-bundle": "v2.8.2", + "symfony/monolog-bundle": "v3.3.1", + "symfony/property-access": "v2.8.52", + "symfony/swiftmailer-bundle": "v3.0.3", + "symfony/symfony": "v2.8.52", + "twig/extensions": "v1.5.4", + "twig/twig": "v1.42.2", "dunglas/api-bundle": "dev-master#b30de689f94410c7dc0e449f2ecc15cfa8e70f54", "escapestudios/wsse-authentication-bundle": "dev-advancedUserInterface", From e98af5cef5037223e3f767a9bf7cbf5c8ea7b14f Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Apr 2021 22:07:45 +0200 Subject: [PATCH 010/140] modified by composer --- app/SymfonyRequirements.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index b21edde67..b6a8564cd 100755 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -389,7 +389,7 @@ public function __construct() { /* mandatory requirements follow */ - $installedPhpVersion = phpversion(); + $installedPhpVersion = PHP_VERSION; $requiredPhpVersion = $this->getPhpRequiredVersion(); $this->addRecommendation( @@ -446,15 +446,8 @@ public function __construct() ); if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) { - $timezones = array(); - foreach (DateTimeZone::listAbbreviations() as $abbreviations) { - foreach ($abbreviations as $abbreviation) { - $timezones[$abbreviation['timezone_id']] = true; - } - } - $this->addRequirement( - isset($timezones[@date_default_timezone_get()]), + in_array(@date_default_timezone_get(), DateTimeZone::listIdentifiers(), true), sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()), 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' ); @@ -720,7 +713,7 @@ function_exists('posix_isatty'), 'Install and/or enable a PHP accelerator (highly recommended).' ); - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) { $this->addRecommendation( $this->getRealpathCacheSize() >= 5 * 1024 * 1024, 'realpath_cache_size should be at least 5M in php.ini', From ad202d5267e12453c6cd2d1f932210394cfa28f0 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 25 Apr 2021 18:53:36 +0200 Subject: [PATCH 011/140] dunglas/api-bundle use new name api-platform/core use /core last commit before their v2 changes stability to dev , nelmio to 2.10.0, php 7.1.33 --- composer.json | 6 +- composer.lock | 1029 +++++++++++++++++-------------------------------- 2 files changed, 353 insertions(+), 682 deletions(-) diff --git a/composer.json b/composer.json index 5c0e858bc..ff9a726fd 100644 --- a/composer.json +++ b/composer.json @@ -71,13 +71,13 @@ "twig/extensions": "v1.5.4", "twig/twig": "v1.42.2", - "dunglas/api-bundle": "dev-master#b30de689f94410c7dc0e449f2ecc15cfa8e70f54", + "api-platform/core": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", "escapestudios/wsse-authentication-bundle": "dev-advancedUserInterface", "fr3d/ldap-bundle": "dev-master", "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", - "nelmio/api-doc-bundle": "~2.9@dev" + "nelmio/api-doc-bundle": "2.10.0" }, "require-dev": { "phpunit/phpunit": "5.7.27", @@ -90,7 +90,7 @@ "PartKeepr": "src/backend" } }, - "minimum-stability": "stable", + "minimum-stability": "dev", "scripts": { "post-install-cmd": [ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", diff --git a/composer.lock b/composer.lock index cd1b2a642..d8f3c4ba4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,84 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "005da634ba3ea4356b95323be5a97d37", + "content-hash": "84b4d6a423774939c9642ddce492e488", "packages": [ + { + "name": "api-platform/core", + "version": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", + "source": { + "type": "git", + "url": "https://github.com/api-platform/core.git", + "reference": "3815fde6b7f29d52af40327308755124a1d640a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/api-platform/core/zipball/3815fde6b7f29d52af40327308755124a1d640a0", + "reference": "3815fde6b7f29d52af40327308755124a1d640a0", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "symfony/serializer": "^2.7.2|~3.0", + "symfony/validator": "~2.5|~3.0", + "symfony/framework-bundle": "~2.6|~3.0", + "symfony/proxy-manager-bridge": "~2.3|~3.0", + "ocramius/proxy-manager": "~1.0", + "doctrine/inflector": "~1.0", + "dunglas/php-property-info": "~0.2", + "phpdocumentor/reflection": "^1.0.7", + "willdurand/negotiation": "~1.4" + }, + "require-dev": { + "friendsofsymfony/user-bundle": "~1.3", + "behat/behat": "~3.0", + "behat/symfony2-extension": "~2.0", + "behat/mink": "~1.5", + "behat/mink-extension": "~2.0", + "behat/mink-browserkit-driver": "~1.1", + "behatch/contexts": "dev-master", + "symfony/finder": "~2.3", + "symfony/security": "~2.7.2|~3.0", + "doctrine/orm": "~2.2,>=2.2.3", + "doctrine/doctrine-bundle": "~1.2", + "php-mock/php-mock-phpunit": "~1.1" + }, + "suggest": { + "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge." + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "dev-main" + } + }, + "autoload": { + "psr-4": { + "Dunglas\\ApiBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com", + "homepage": "http://dunglas.fr" + } + ], + "description": "JSON-LD / Hydra REST API for Symfony", + "homepage": "http://api-platform.com", + "keywords": [ + "Hydra", + "JSON-LD", + "api", + "json", + "rest" + ], + "time": "2015-09-17T13:20:09+00:00" + }, { "name": "atelierspierrot/famfamfam-silk-sprite", "version": "v1.0.0", @@ -143,34 +219,38 @@ }, { "name": "composer/installers", - "version": "v1.2.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "d78064c68299743e0161004f2de3a0204e33b804" + "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804", - "reference": "d78064c68299743e0161004f2de3a0204e33b804", + "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", + "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0" + "composer-plugin-api": "^1.0 || ^2.0" }, "replace": { "roundcube/plugin-installer": "*", "shama/baton": "*" }, "require-dev": { - "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "4.1.*" + "composer/composer": "1.6.* || ^2.0", + "composer/semver": "^1 || ^3", + "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan-phpunit": "^0.12.16", + "symfony/phpunit-bridge": "^4.2 || ^5", + "symfony/process": "^2.3" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.x-dev" } }, "autoload": { @@ -194,15 +274,23 @@ "keywords": [ "Craft", "Dolibarr", + "Eliasis", "Hurad", "ImageCMS", + "Kanboard", + "Lan Management System", "MODX Evo", + "MantisBT", "Mautic", + "Maya", "OXID", "Plentymarkets", + "Porto", "RadPHP", "SMF", + "Starbug", "Thelia", + "Whmcs", "WolfCMS", "agl", "aimeos", @@ -217,28 +305,39 @@ "croogo", "dokuwiki", "drupal", + "eZ Platform", "elgg", "expressionengine", "fuelphp", "grav", "installer", + "itop", "joomla", + "known", "kohana", "laravel", + "lavalite", "lithium", "magento", + "majima", "mako", "mediawiki", "modulework", + "modx", "moodle", + "osclass", "phpbb", "piwik", "ppi", + "processwire", "puppet", + "pxcms", "reindex", "roundcube", "shopware", "silverstripe", + "sydes", + "sylius", "symfony", "typo3", "wordpress", @@ -246,20 +345,34 @@ "zend", "zikula" ], - "time": "2016-08-13T20:53:52+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-01-14T11:07:16+00:00" }, { "name": "doctrine/annotations", - "version": "1.11.1", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad" + "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad", - "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b", + "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b", "shasum": "" }, "require": { @@ -274,11 +387,6 @@ "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" @@ -317,44 +425,43 @@ "docblock", "parser" ], - "time": "2020-10-26T10:28:16+00:00" + "time": "2021-02-21T21:00:45+00:00" }, { "name": "doctrine/cache", - "version": "1.10.2", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "13e3381b25847283a91948d04640543941309727" + "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727", - "reference": "13e3381b25847283a91948d04640543941309727", + "url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0", + "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0", "shasum": "" }, "require": { "php": "~7.1 || ^8.0" }, "conflict": { - "doctrine/common": ">2.2,<2.4" + "doctrine/common": ">2.2,<2.4", + "psr/cache": ">=3" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^6.0", + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^8.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "predis/predis": "~1.0", + "psr/cache": "^1.0 || ^2.0", + "symfony/cache": "^4.4 || ^5.2" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" @@ -413,7 +520,7 @@ "type": "tidelift" } ], - "time": "2020-07-07T18:54:01+00:00" + "time": "2021-04-13T14:46:17+00:00" }, { "name": "doctrine/collections", @@ -985,33 +1092,38 @@ }, { "name": "doctrine/inflector", - "version": "1.3.1", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^8.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -1040,15 +1152,35 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], + "time": "2021-04-16T17:34:40+00:00" }, { "name": "doctrine/instantiator", @@ -1319,83 +1451,6 @@ ], "time": "2017-12-17T02:57:51+00:00" }, - { - "name": "dunglas/api-bundle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/api-platform/core.git", - "reference": "b30de689f94410c7dc0e449f2ecc15cfa8e70f54" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/b30de689f94410c7dc0e449f2ecc15cfa8e70f54", - "reference": "b30de689f94410c7dc0e449f2ecc15cfa8e70f54", - "shasum": "" - }, - "require": { - "doctrine/doctrine-bundle": "~1.2", - "doctrine/inflector": "~1.0", - "doctrine/orm": "~2.2,>=2.2.3", - "dunglas/php-property-info": "~0.2", - "ocramius/proxy-manager": "~1.0", - "php": ">=5.5", - "phpdocumentor/reflection": "^1.0.7", - "symfony/framework-bundle": "~2.6|~3.0", - "symfony/proxy-manager-bridge": "~2.3", - "symfony/serializer": "^2.7.2|~3.0", - "symfony/validator": "~2.5|~3.0", - "willdurand/negotiation": "~1.4" - }, - "require-dev": { - "behat/behat": "~3.0", - "behat/mink": "~1.5", - "behat/mink-browserkit-driver": "~1.1", - "behat/mink-extension": "~2.0", - "behat/symfony2-extension": "~2.0", - "behatch/contexts": "dev-master", - "friendsofsymfony/user-bundle": "~1.3", - "phpunit/phpunit": "~4.6", - "symfony/finder": "~2.3", - "symfony/security": "~2.7.2|~3.0" - }, - "suggest": { - "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge." - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Dunglas\\ApiBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com", - "homepage": "http://dunglas.fr" - } - ], - "description": "JSON-LD / Hydra REST API for Symfony", - "homepage": "http://api-platform.com", - "keywords": [ - "Hydra", - "JSON-LD", - "api", - "json", - "rest" - ], - "abandoned": "api-platform/api-pack", - "time": "2015-09-23T13:09:28+00:00" - }, { "name": "dunglas/php-property-info", "version": "v0.2.3", @@ -2010,16 +2065,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "60d379c243457e073cff02bc323a2a86cb355631" + "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631", - "reference": "60d379c243457e073cff02bc323a2a86cb355631", + "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", "shasum": "" }, "require": { @@ -2057,20 +2112,20 @@ "keywords": [ "promise" ], - "time": "2020-09-30T07:37:28+00:00" + "time": "2021-03-07T09:25:29+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" + "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", + "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", "shasum": "" }, "require": { @@ -2128,7 +2183,7 @@ "uri", "url" ], - "time": "2020-09-30T07:37:11+00:00" + "time": "2021-03-21T16:25:00+00:00" }, { "name": "imagine/imagine", @@ -2493,30 +2548,28 @@ }, { "name": "michelf/php-markdown", - "version": "1.7.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220" + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220", - "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-lib": "1.4.x-dev" - } + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" }, + "type": "library", "autoload": { - "psr-0": { - "Michelf": "" + "psr-4": { + "Michelf\\": "Michelf/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2540,7 +2593,7 @@ "keywords": [ "markdown" ], - "time": "2016-10-29T18:58:20+00:00" + "time": "2019-12-02T02:32:27+00:00" }, { "name": "monolog/monolog", @@ -2626,17 +2679,17 @@ }, { "name": "nelmio/api-doc-bundle", - "version": "dev-master", + "version": "2.10.0", "target-dir": "Nelmio/ApiDocBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "9af37448fa2f82856d068205afa96e9874527672" + "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/9af37448fa2f82856d068205afa96e9874527672", - "reference": "9af37448fa2f82856d068205afa96e9874527672", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/fb863954d8aec29bdc6d9b2b03f15759d4bf2995", + "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995", "shasum": "" }, "require": { @@ -2647,10 +2700,11 @@ }, "conflict": { "jms/serializer": "<0.12", - "jms/serializer-bundle": "<0.11" + "jms/serializer-bundle": "<0.11", + "twig/twig": "<1.12" }, "require-dev": { - "dunglas/api-bundle": "~1.0@beta", + "dunglas/api-bundle": "~1.0", "friendsofsymfony/rest-bundle": "~1.0", "jms/serializer-bundle": ">=0.11", "sensio/framework-extra-bundle": "~3.0", @@ -2673,7 +2727,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.9.x-dev" + "dev-master": "2.10.x-dev" } }, "autoload": { @@ -2702,7 +2756,7 @@ "documentation", "rest" ], - "time": "2015-09-30T21:35:45+00:00" + "time": "2015-10-23T09:30:55+00:00" }, { "name": "nfq-alpha/sprite-bundle", @@ -2750,19 +2804,20 @@ }, { "name": "nikic/php-parser", - "version": "v0.9.4", + "version": "v0.9.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f" + "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1e5e280ae88a27effa2ae4aa2bd088494ed8594f", - "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb", + "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb", "shasum": "" }, "require": { + "ext-tokenizer": "*", "php": ">=5.2" }, "type": "library", @@ -2790,7 +2845,7 @@ "parser", "php" ], - "time": "2013-08-25T17:11:40+00:00" + "time": "2014-07-23T18:24:17+00:00" }, { "name": "ocramius/proxy-manager", @@ -2857,16 +2912,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.19", + "version": "v2.0.20", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241" + "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241", - "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a", + "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a", "shasum": "" }, "require": { @@ -2902,7 +2957,7 @@ "pseudorandom", "random" ], - "time": "2020-10-15T10:06:57+00:00" + "time": "2021-04-17T09:33:01+00:00" }, { "name": "partkeepr/extjs6", @@ -3371,22 +3426,30 @@ }, { "name": "psr/log", - "version": "1.0.0", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3400,12 +3463,13 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21T11:40:51+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "ralouphie/getallheaders", @@ -3751,6 +3815,7 @@ } ], "description": "A security checker for your composer.lock", + "abandoned": "https://github.com/fabpot/local-php-security-checker", "time": "2019-11-01T13:20:14+00:00" }, { @@ -3955,20 +4020,20 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.4", + "version": "v6.2.7", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" + "reference": "15f7faf8508e04471f666633addacf54c0ab5933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", + "reference": "15f7faf8508e04471f666633addacf54c0ab5933", "shasum": "" }, "require": { - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.0|^3.1", "php": ">=7.0.0", "symfony/polyfill-iconv": "^1.0", "symfony/polyfill-intl-idn": "^1.10", @@ -4022,7 +4087,7 @@ "type": "tidelift" } ], - "time": "2020-12-08T18:02:06+00:00" + "time": "2021-03-09T12:30:35+00:00" }, { "name": "symfony/assetic-bundle", @@ -4097,16 +4162,16 @@ }, { "name": "symfony/http-client", - "version": "v4.4.18", + "version": "v4.4.21", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "dc518f62677944938026746e6e58ac37ebcc6238" + "reference": "911177e186b82e5b9a9f41c13af53699b6745657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/dc518f62677944938026746e6e58ac37ebcc6238", - "reference": "dc518f62677944938026746e6e58ac37ebcc6238", + "url": "https://api.github.com/repos/symfony/http-client/zipball/911177e186b82e5b9a9f41c13af53699b6745657", + "reference": "911177e186b82e5b9a9f41c13af53699b6745657", "shasum": "" }, "require": { @@ -4120,10 +4185,10 @@ "php-http/async-client-implementation": "*", "php-http/client-implementation": "*", "psr/http-client-implementation": "1.0", - "symfony/http-client-implementation": "1.1" + "symfony/http-client-implementation": "1.1|2.0" }, "require-dev": { - "guzzlehttp/promises": "^1.3.1", + "guzzlehttp/promises": "^1.4", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", @@ -4154,7 +4219,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpClient component", + "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "funding": [ { @@ -4170,7 +4235,7 @@ "type": "tidelift" } ], - "time": "2020-12-05T06:03:08+00:00" + "time": "2021-03-25T17:52:07+00:00" }, { "name": "symfony/http-client-contracts", @@ -4249,16 +4314,16 @@ }, { "name": "symfony/mime", - "version": "v4.4.18", + "version": "v4.4.21", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "7a4176a1cbc4cc99268c531de547fccbd0beb370" + "reference": "50d7a1d569edad1f1321c59123c4c322c8daff7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/7a4176a1cbc4cc99268c531de547fccbd0beb370", - "reference": "7a4176a1cbc4cc99268c531de547fccbd0beb370", + "url": "https://api.github.com/repos/symfony/mime/zipball/50d7a1d569edad1f1321c59123c4c322c8daff7c", + "reference": "50d7a1d569edad1f1321c59123c4c322c8daff7c", "shasum": "" }, "require": { @@ -4267,10 +4332,11 @@ "symfony/polyfill-mbstring": "^1.0" }, "conflict": { + "egulias/email-validator": "~3.0.0", "symfony/mailer": "<4.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10", + "egulias/email-validator": "^2.1.10|^3.1", "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", @@ -4296,7 +4362,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "A library to manipulate MIME messages", + "description": "Allows manipulating MIME messages", "homepage": "https://symfony.com", "keywords": [ "mime", @@ -4316,7 +4382,7 @@ "type": "tidelift" } ], - "time": "2020-12-09T11:15:38+00:00" + "time": "2021-03-12T08:47:38+00:00" }, { "name": "symfony/monolog-bundle", @@ -4383,16 +4449,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "f5191eb0e98e08d12eb49fc0ed0820e37de89fdf" + "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/f5191eb0e98e08d12eb49fc0ed0820e37de89fdf", - "reference": "f5191eb0e98e08d12eb49fc0ed0820e37de89fdf", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/bc9974e74f8c05f4ceb500b1e0603e36be7d8223", + "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223", "shasum": "" }, "require": { @@ -4401,7 +4467,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4453,20 +4519,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { @@ -4478,7 +4544,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4529,20 +4595,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024" + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", "shasum": "" }, "require": { @@ -4554,7 +4620,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4606,33 +4672,32 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "c44d5bf6a75eed79555c6bf37505c6d39559353e" + "reference": "af1842919c7e7364aaaa2798b29839e3ba168588" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/c44d5bf6a75eed79555c6bf37505c6d39559353e", - "reference": "c44d5bf6a75eed79555c6bf37505c6d39559353e", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/af1842919c7e7364aaaa2798b29839e3ba168588", + "reference": "af1842919c7e7364aaaa2798b29839e3ba168588", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/intl": "~2.3|~3.0|~4.0|~5.0" + "php": ">=7.1" }, "suggest": { - "ext-intl": "For best performance" + "ext-intl": "For best performance and support of other locales than \"en\"" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4642,6 +4707,15 @@ "autoload": { "files": [ "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Icu\\": "" + }, + "classmap": [ + "Resources/stubs" + ], + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4682,20 +4756,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", "shasum": "" }, "require": { @@ -4709,7 +4783,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4766,20 +4840,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "727d1096295d807c309fb01a851577302394c897" + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", - "reference": "727d1096295d807c309fb01a851577302394c897", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", "shasum": "" }, "require": { @@ -4791,7 +4865,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4847,20 +4921,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", "shasum": "" }, "require": { @@ -4872,7 +4946,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4924,7 +4998,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-php54", @@ -5188,16 +5262,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { @@ -5206,7 +5280,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5257,20 +5331,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed" + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed", - "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", "shasum": "" }, "require": { @@ -5279,7 +5353,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5333,20 +5407,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "fd2008fac0a11ae100537406d95887d5a9155e4f" + "reference": "5caa5b2bacaa12a508697d95b303954f442cc7f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/fd2008fac0a11ae100537406d95887d5a9155e4f", - "reference": "fd2008fac0a11ae100537406d95887d5a9155e4f", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/5caa5b2bacaa12a508697d95b303954f442cc7f1", + "reference": "5caa5b2bacaa12a508697d95b303954f442cc7f1", "shasum": "" }, "require": { @@ -5355,7 +5429,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5403,7 +5477,7 @@ "type": "tidelift" } ], - "time": "2020-10-24T08:53:22+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/security-acl", @@ -6060,89 +6134,31 @@ "abandoned": "laminas/laminas-eventmanager", "time": "2018-04-25T15:33:34+00:00" }, - { - "name": "zendframework/zend-hydrator", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0@dev", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-inputfilter": "^2.6", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", - "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage", - "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-1.0": "1.0-dev", - "dev-release-1.1": "1.1-dev", - "dev-master": "2.0-dev", - "dev-develop": "2.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Hydrator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-hydrator", - "keywords": [ - "hydrator", - "zf2" - ], - "abandoned": "laminas/laminas-hydrator", - "time": "2016-02-18T22:38:26+00:00" - }, { "name": "zendframework/zend-ldap", - "version": "2.5.1", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-ldap.git", - "reference": "c647a86224030543401634dbafd514074b49b2b6" + "reference": "525ec97cd18a42a953c6a78c1019f967d2539b88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-ldap/zipball/c647a86224030543401634dbafd514074b49b2b6", - "reference": "c647a86224030543401634dbafd514074b49b2b6", + "url": "https://api.github.com/repos/zendframework/zend-ldap/zipball/525ec97cd18a42a953c6a78c1019f967d2539b88", + "reference": "525ec97cd18a42a953c6a78c1019f967d2539b88", "shasum": "" }, "require": { "ext-ldap": "*", - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" + "php": "^5.6 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5" + "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-config": "^2.5", + "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { "zendframework/zend-eventmanager": "Zend\\EventManager component" @@ -6150,8 +6166,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" } }, "autoload": { @@ -6163,242 +6179,17 @@ "license": [ "BSD-3-Clause" ], - "description": "provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory", - "homepage": "https://github.com/zendframework/zend-ldap", + "description": "Provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory", "keywords": [ + "ZendFramework", "ldap", - "zf2" + "zf" ], "abandoned": "laminas/laminas-ldap", - "time": "2015-06-03T15:32:02+00:00" - }, - { - "name": "zendframework/zend-stdlib", - "version": "2.7.7", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f", - "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-hydrator": "~1.1" - }, - "require-dev": { - "athletic/athletic": "~0.1", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-2.7": "2.7-dev", - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" - ], - "abandoned": "laminas/laminas-stdlib", - "time": "2016-04-12T21:17:31+00:00" + "time": "2019-10-17T16:26:26+00:00" } ], "packages-dev": [ - { - "name": "ddeboer/data-import", - "version": "0.18.0", - "source": { - "type": "git", - "url": "https://github.com/ddeboer/data-import.git", - "reference": "cbae2f570192b738c5cec835fbf583a75c52d535" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ddeboer/data-import/zipball/cbae2f570192b738c5cec835fbf583a75c52d535", - "reference": "cbae2f570192b738c5cec835fbf583a75c52d535", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" - }, - "require-dev": { - "doctrine/dbal": "*", - "doctrine/orm": "*", - "ext-iconv": "*", - "ext-mbstring": "*", - "ext-sqlite3": "*", - "phpoffice/phpexcel": "*", - "symfony/console": "~2.5.0", - "symfony/property-access": "*", - "symfony/validator": "~2.3.0" - }, - "suggest": { - "doctrine/dbal": "If you want to use the DbalReader", - "ext-iconv": "For the CharsetValueConverter", - "ext-mbstring": "For the CharsetValueConverter", - "phpoffice/phpexcel": "If you want to use the ExcelReader", - "symfony/console": "If you want to use the ConsoleProgressWriter", - "symfony/property-access": "If you want to use the ObjectConverter", - "symfony/validator": "to use the ValidatorFilter" - }, - "type": "library", - "autoload": { - "psr-0": { - "Ddeboer\\DataImport": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "The community", - "homepage": "https://github.com/ddeboer/data-import/graphs/contributors" - }, - { - "name": "David de Boer", - "email": "david@ddeboer.nl" - } - ], - "description": "Import data from, and export data to, a range of file formats and media", - "keywords": [ - "csv", - "data", - "doctrine", - "excel", - "export", - "import" - ], - "time": "2015-04-21T14:06:20+00:00" - }, - { - "name": "guzzle/guzzle", - "version": "v3.9.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "abandoned": "guzzlehttp/guzzle", - "time": "2015-03-18T18:23:50+00:00" - }, { "name": "liip/functional-test-bundle", "version": "1.10.0", @@ -7081,75 +6872,6 @@ "abandoned": true, "time": "2017-06-30T09:13:00+00:00" }, - { - "name": "satooshi/php-coveralls", - "version": "v0.6.1", - "source": { - "type": "git", - "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760", - "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-simplexml": "*", - "guzzle/guzzle": ">=3.0", - "php": ">=5.3", - "psr/log": "1.0.0", - "symfony/config": ">=2.0", - "symfony/console": ">=2.0", - "symfony/stopwatch": ">=2.2", - "symfony/yaml": ">=2.0" - }, - "require-dev": { - "apigen/apigen": "2.8.*@stable", - "pdepend/pdepend": "dev-master", - "phpmd/phpmd": "dev-master", - "phpunit/php-invoker": ">=1.1.0,<1.2.0", - "phpunit/phpunit": "3.7.*@stable", - "sebastian/finder-facade": "dev-master", - "sebastian/phpcpd": "1.4.*@stable", - "squizlabs/php_codesniffer": "1.4.*@stable", - "theseer/fdomdocument": "dev-master" - }, - "bin": [ - "composer/bin/coveralls" - ], - "type": "library", - "autoload": { - "psr-0": { - "Contrib\\Component": "src/", - "Contrib\\Bundle": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" - } - ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/satooshi/php-coveralls", - "keywords": [ - "ci", - "coverage", - "github", - "test" - ], - "abandoned": "php-coveralls/php-coveralls", - "time": "2013-05-04T08:07:33+00:00" - }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.2", @@ -7668,72 +7390,21 @@ "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "sensio/generator-bundle", - "version": "v2.5.3", - "target-dir": "Sensio/Bundle/GeneratorBundle", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", - "shasum": "" - }, - "require": { - "symfony/console": "~2.5", - "symfony/framework-bundle": "~2.2" - }, - "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.5.x-dev" - } - }, - "autoload": { - "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle generates code for you", - "abandoned": "symfony/maker-bundle", - "time": "2015-03-17T06:36:52+00:00" } ], "aliases": [], - "minimum-stability": "stable", + "minimum-stability": "dev", "stability-flags": { - "dunglas/api-bundle": 20, "escapestudios/wsse-authentication-bundle": 20, "fr3d/ldap-bundle": 20, "nfq-alpha/sprite-bundle": 20, "partkeepr/extjs6": 20, - "partkeepr/remote-file-loader": 20, - "nelmio/api-doc-bundle": 20 + "partkeepr/remote-file-loader": 20 }, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.6.0" + "php": "7.1.33" }, "platform-dev": [], "plugin-api-version": "1.1.0" From 396c61cc4822d9d6e5b7b5969a8449d70a29a663 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 30 Apr 2021 19:22:42 +0200 Subject: [PATCH 012/140] missing AppClassLoader in dev --- web/app_dev.php | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/web/app_dev.php b/web/app_dev.php index e74228d5d..91ab679c4 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -1,12 +1,13 @@ unregister(); + $apcLoader->register(true); + */ + Debug::enable(); require_once __DIR__.'/../app/AppKernel.php'; +//require_once __DIR__.'/../app/AppCache.php'; + +if (!file_exists('../app/config/parameters.php')) { + echo 'Unable to load parameters.php - please run setup to generate a parameters.php file.'; + exit; +} $kernel = new AppKernel('dev', true); +// $kernel = new AppKernel('prod', false); $kernel->loadClassCache(); +//$kernel = new AppCache($kernel); $request = Request::createFromGlobals(); $response = $kernel->handle($request); $response->send(); From 5271af0bcb824dbf3e1aaf7fec18d232c05fc66d Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 2 May 2021 20:02:18 +0200 Subject: [PATCH 013/140] PK in working state --- composer.json | 2 +- composer.lock | 1025 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 677 insertions(+), 350 deletions(-) diff --git a/composer.json b/composer.json index ff9a726fd..d55984fc9 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", - "nelmio/api-doc-bundle": "2.10.0" + "nelmio/api-doc-bundle": "~2.9@dev" }, "require-dev": { "phpunit/phpunit": "5.7.27", diff --git a/composer.lock b/composer.lock index d8f3c4ba4..8643d61ab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,84 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "84b4d6a423774939c9642ddce492e488", + "content-hash": "005da634ba3ea4356b95323be5a97d37", "packages": [ - { - "name": "api-platform/core", - "version": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", - "source": { - "type": "git", - "url": "https://github.com/api-platform/core.git", - "reference": "3815fde6b7f29d52af40327308755124a1d640a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/3815fde6b7f29d52af40327308755124a1d640a0", - "reference": "3815fde6b7f29d52af40327308755124a1d640a0", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "symfony/serializer": "^2.7.2|~3.0", - "symfony/validator": "~2.5|~3.0", - "symfony/framework-bundle": "~2.6|~3.0", - "symfony/proxy-manager-bridge": "~2.3|~3.0", - "ocramius/proxy-manager": "~1.0", - "doctrine/inflector": "~1.0", - "dunglas/php-property-info": "~0.2", - "phpdocumentor/reflection": "^1.0.7", - "willdurand/negotiation": "~1.4" - }, - "require-dev": { - "friendsofsymfony/user-bundle": "~1.3", - "behat/behat": "~3.0", - "behat/symfony2-extension": "~2.0", - "behat/mink": "~1.5", - "behat/mink-extension": "~2.0", - "behat/mink-browserkit-driver": "~1.1", - "behatch/contexts": "dev-master", - "symfony/finder": "~2.3", - "symfony/security": "~2.7.2|~3.0", - "doctrine/orm": "~2.2,>=2.2.3", - "doctrine/doctrine-bundle": "~1.2", - "php-mock/php-mock-phpunit": "~1.1" - }, - "suggest": { - "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge." - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "dev-main" - } - }, - "autoload": { - "psr-4": { - "Dunglas\\ApiBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com", - "homepage": "http://dunglas.fr" - } - ], - "description": "JSON-LD / Hydra REST API for Symfony", - "homepage": "http://api-platform.com", - "keywords": [ - "Hydra", - "JSON-LD", - "api", - "json", - "rest" - ], - "time": "2015-09-17T13:20:09+00:00" - }, { "name": "atelierspierrot/famfamfam-silk-sprite", "version": "v1.0.0", @@ -219,38 +143,34 @@ }, { "name": "composer/installers", - "version": "v1.10.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d" + "reference": "d78064c68299743e0161004f2de3a0204e33b804" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", - "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", + "url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804", + "reference": "d78064c68299743e0161004f2de3a0204e33b804", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0 || ^2.0" + "composer-plugin-api": "^1.0" }, "replace": { "roundcube/plugin-installer": "*", "shama/baton": "*" }, "require-dev": { - "composer/composer": "1.6.* || ^2.0", - "composer/semver": "^1 || ^3", - "phpstan/phpstan": "^0.12.55", - "phpstan/phpstan-phpunit": "^0.12.16", - "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.3" + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-main": "1.x-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -274,23 +194,15 @@ "keywords": [ "Craft", "Dolibarr", - "Eliasis", "Hurad", "ImageCMS", - "Kanboard", - "Lan Management System", "MODX Evo", - "MantisBT", "Mautic", - "Maya", "OXID", "Plentymarkets", - "Porto", "RadPHP", "SMF", - "Starbug", "Thelia", - "Whmcs", "WolfCMS", "agl", "aimeos", @@ -305,39 +217,28 @@ "croogo", "dokuwiki", "drupal", - "eZ Platform", "elgg", "expressionengine", "fuelphp", "grav", "installer", - "itop", "joomla", - "known", "kohana", "laravel", - "lavalite", "lithium", "magento", - "majima", "mako", "mediawiki", "modulework", - "modx", "moodle", - "osclass", "phpbb", "piwik", "ppi", - "processwire", "puppet", - "pxcms", "reindex", "roundcube", "shopware", "silverstripe", - "sydes", - "sylius", "symfony", "typo3", "wordpress", @@ -345,34 +246,20 @@ "zend", "zikula" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-01-14T11:07:16+00:00" + "time": "2016-08-13T20:53:52+00:00" }, { "name": "doctrine/annotations", - "version": "1.12.1", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b" + "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad", + "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad", "shasum": "" }, "require": { @@ -387,6 +274,11 @@ "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11.x-dev" + } + }, "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" @@ -425,43 +317,44 @@ "docblock", "parser" ], - "time": "2021-02-21T21:00:45+00:00" + "time": "2020-10-26T10:28:16+00:00" }, { "name": "doctrine/cache", - "version": "1.11.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0" + "reference": "13e3381b25847283a91948d04640543941309727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0", - "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0", + "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727", + "reference": "13e3381b25847283a91948d04640543941309727", "shasum": "" }, "require": { "php": "~7.1 || ^8.0" }, "conflict": { - "doctrine/common": ">2.2,<2.4", - "psr/cache": ">=3" + "doctrine/common": ">2.2,<2.4" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "cache/integration-tests": "dev-master", - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^6.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "predis/predis": "~1.0", - "psr/cache": "^1.0 || ^2.0", - "symfony/cache": "^4.4 || ^5.2" + "phpunit/phpunit": "^7.0", + "predis/predis": "~1.0" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9.x-dev" + } + }, "autoload": { "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" @@ -520,7 +413,7 @@ "type": "tidelift" } ], - "time": "2021-04-13T14:46:17+00:00" + "time": "2020-07-07T18:54:01+00:00" }, { "name": "doctrine/collections", @@ -1092,38 +985,33 @@ }, { "name": "doctrine/inflector", - "version": "1.4.4", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" + "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", - "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -1152,35 +1040,15 @@ "email": "schmittjoh@gmail.com" } ], - "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", - "homepage": "https://www.doctrine-project.org/projects/inflector.html", + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", "keywords": [ "inflection", - "inflector", - "lowercase", - "manipulation", - "php", - "plural", - "singular", - "strings", - "uppercase", - "words" - ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" - } + "pluralize", + "singularize", + "string" ], - "time": "2021-04-16T17:34:40+00:00" + "time": "2019-10-30T19:59:35+00:00" }, { "name": "doctrine/instantiator", @@ -1451,6 +1319,83 @@ ], "time": "2017-12-17T02:57:51+00:00" }, + { + "name": "api-platform/core", + "version": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", + "source": { + "type": "git", + "url": "https://github.com/api-platform/core.git", + "reference": "3815fde6b7f29d52af40327308755124a1d640a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/api-platform/core/zipball/3815fde6b7f29d52af40327308755124a1d640a0", + "reference": "3815fde6b7f29d52af40327308755124a1d640a0", + "shasum": "" + }, + "require": { + "doctrine/doctrine-bundle": "~1.2", + "doctrine/inflector": "~1.0", + "doctrine/orm": "~2.2,>=2.2.3", + "dunglas/php-property-info": "~0.2", + "ocramius/proxy-manager": "~1.0", + "php": ">=5.5", + "phpdocumentor/reflection": "^1.0.7", + "symfony/framework-bundle": "~2.6|~3.0", + "symfony/proxy-manager-bridge": "~2.3", + "symfony/serializer": "^2.7.2|~3.0", + "symfony/validator": "~2.5|~3.0", + "willdurand/negotiation": "~1.4" + }, + "require-dev": { + "behat/behat": "~3.0", + "behat/mink": "~1.5", + "behat/mink-browserkit-driver": "~1.1", + "behat/mink-extension": "~2.0", + "behat/symfony2-extension": "~2.0", + "behatch/contexts": "dev-master", + "friendsofsymfony/user-bundle": "~1.3", + "phpunit/phpunit": "~4.6", + "symfony/finder": "~2.3", + "symfony/security": "~2.7.2|~3.0" + }, + "suggest": { + "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge." + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Dunglas\\ApiBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com", + "homepage": "http://dunglas.fr" + } + ], + "description": "JSON-LD / Hydra REST API for Symfony", + "homepage": "http://api-platform.com", + "keywords": [ + "Hydra", + "JSON-LD", + "api", + "json", + "rest" + ], + "abandoned": "api-platform/api-pack", + "time": "2015-09-23T13:09:28+00:00" + }, { "name": "dunglas/php-property-info", "version": "v0.2.3", @@ -2065,16 +2010,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "60d379c243457e073cff02bc323a2a86cb355631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631", + "reference": "60d379c243457e073cff02bc323a2a86cb355631", "shasum": "" }, "require": { @@ -2112,20 +2057,20 @@ "keywords": [ "promise" ], - "time": "2021-03-07T09:25:29+00:00" + "time": "2020-09-30T07:37:28+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", "shasum": "" }, "require": { @@ -2183,7 +2128,7 @@ "uri", "url" ], - "time": "2021-03-21T16:25:00+00:00" + "time": "2020-09-30T07:37:11+00:00" }, { "name": "imagine/imagine", @@ -2548,28 +2493,30 @@ }, { "name": "michelf/php-markdown", - "version": "1.9.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" + "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220", + "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "require-dev": { - "phpunit/phpunit": ">=4.3 <5.8" - }, "type": "library", + "extra": { + "branch-alias": { + "dev-lib": "1.4.x-dev" + } + }, "autoload": { - "psr-4": { - "Michelf\\": "Michelf/" + "psr-0": { + "Michelf": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -2593,7 +2540,7 @@ "keywords": [ "markdown" ], - "time": "2019-12-02T02:32:27+00:00" + "time": "2016-10-29T18:58:20+00:00" }, { "name": "monolog/monolog", @@ -2679,17 +2626,17 @@ }, { "name": "nelmio/api-doc-bundle", - "version": "2.10.0", + "version": "dev-master", "target-dir": "Nelmio/ApiDocBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995" + "reference": "9af37448fa2f82856d068205afa96e9874527672" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/fb863954d8aec29bdc6d9b2b03f15759d4bf2995", - "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/9af37448fa2f82856d068205afa96e9874527672", + "reference": "9af37448fa2f82856d068205afa96e9874527672", "shasum": "" }, "require": { @@ -2700,11 +2647,9 @@ }, "conflict": { "jms/serializer": "<0.12", - "jms/serializer-bundle": "<0.11", - "twig/twig": "<1.12" + "jms/serializer-bundle": "<0.11" }, "require-dev": { - "dunglas/api-bundle": "~1.0", "friendsofsymfony/rest-bundle": "~1.0", "jms/serializer-bundle": ">=0.11", "sensio/framework-extra-bundle": "~3.0", @@ -2727,7 +2672,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.10.x-dev" + "dev-master": "2.9.x-dev" } }, "autoload": { @@ -2756,7 +2701,7 @@ "documentation", "rest" ], - "time": "2015-10-23T09:30:55+00:00" + "time": "2015-09-30T21:35:45+00:00" }, { "name": "nfq-alpha/sprite-bundle", @@ -2804,20 +2749,19 @@ }, { "name": "nikic/php-parser", - "version": "v0.9.5", + "version": "v0.9.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb" + "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb", - "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1e5e280ae88a27effa2ae4aa2bd088494ed8594f", + "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f", "shasum": "" }, "require": { - "ext-tokenizer": "*", "php": ">=5.2" }, "type": "library", @@ -2845,7 +2789,7 @@ "parser", "php" ], - "time": "2014-07-23T18:24:17+00:00" + "time": "2013-08-25T17:11:40+00:00" }, { "name": "ocramius/proxy-manager", @@ -2912,16 +2856,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.20", + "version": "v2.0.19", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a" + "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a", - "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241", + "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241", "shasum": "" }, "require": { @@ -2957,7 +2901,7 @@ "pseudorandom", "random" ], - "time": "2021-04-17T09:33:01+00:00" + "time": "2020-10-15T10:06:57+00:00" }, { "name": "partkeepr/extjs6", @@ -3426,30 +3370,22 @@ }, { "name": "psr/log", - "version": "1.1.3", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", "shasum": "" }, - "require": { - "php": ">=5.3.0" - }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "psr-0": { + "Psr\\Log\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3463,13 +3399,12 @@ } ], "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2020-03-23T09:12:05+00:00" + "time": "2012-12-21T11:40:51+00:00" }, { "name": "ralouphie/getallheaders", @@ -3815,7 +3750,6 @@ } ], "description": "A security checker for your composer.lock", - "abandoned": "https://github.com/fabpot/local-php-security-checker", "time": "2019-11-01T13:20:14+00:00" }, { @@ -4020,20 +3954,20 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.7", + "version": "v6.2.4", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933" + "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", "shasum": "" }, "require": { - "egulias/email-validator": "^2.0|^3.1", + "egulias/email-validator": "^2.0", "php": ">=7.0.0", "symfony/polyfill-iconv": "^1.0", "symfony/polyfill-intl-idn": "^1.10", @@ -4087,7 +4021,7 @@ "type": "tidelift" } ], - "time": "2021-03-09T12:30:35+00:00" + "time": "2020-12-08T18:02:06+00:00" }, { "name": "symfony/assetic-bundle", @@ -4162,16 +4096,16 @@ }, { "name": "symfony/http-client", - "version": "v4.4.21", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "911177e186b82e5b9a9f41c13af53699b6745657" + "reference": "dc518f62677944938026746e6e58ac37ebcc6238" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/911177e186b82e5b9a9f41c13af53699b6745657", - "reference": "911177e186b82e5b9a9f41c13af53699b6745657", + "url": "https://api.github.com/repos/symfony/http-client/zipball/dc518f62677944938026746e6e58ac37ebcc6238", + "reference": "dc518f62677944938026746e6e58ac37ebcc6238", "shasum": "" }, "require": { @@ -4185,10 +4119,10 @@ "php-http/async-client-implementation": "*", "php-http/client-implementation": "*", "psr/http-client-implementation": "1.0", - "symfony/http-client-implementation": "1.1|2.0" + "symfony/http-client-implementation": "1.1" }, "require-dev": { - "guzzlehttp/promises": "^1.4", + "guzzlehttp/promises": "^1.3.1", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", @@ -4219,7 +4153,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", + "description": "Symfony HttpClient component", "homepage": "https://symfony.com", "funding": [ { @@ -4235,7 +4169,7 @@ "type": "tidelift" } ], - "time": "2021-03-25T17:52:07+00:00" + "time": "2020-12-05T06:03:08+00:00" }, { "name": "symfony/http-client-contracts", @@ -4314,16 +4248,16 @@ }, { "name": "symfony/mime", - "version": "v4.4.21", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "50d7a1d569edad1f1321c59123c4c322c8daff7c" + "reference": "7a4176a1cbc4cc99268c531de547fccbd0beb370" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/50d7a1d569edad1f1321c59123c4c322c8daff7c", - "reference": "50d7a1d569edad1f1321c59123c4c322c8daff7c", + "url": "https://api.github.com/repos/symfony/mime/zipball/7a4176a1cbc4cc99268c531de547fccbd0beb370", + "reference": "7a4176a1cbc4cc99268c531de547fccbd0beb370", "shasum": "" }, "require": { @@ -4332,11 +4266,10 @@ "symfony/polyfill-mbstring": "^1.0" }, "conflict": { - "egulias/email-validator": "~3.0.0", "symfony/mailer": "<4.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", + "egulias/email-validator": "^2.1.10", "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", @@ -4362,7 +4295,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Allows manipulating MIME messages", + "description": "A library to manipulate MIME messages", "homepage": "https://symfony.com", "keywords": [ "mime", @@ -4382,7 +4315,7 @@ "type": "tidelift" } ], - "time": "2021-03-12T08:47:38+00:00" + "time": "2020-12-09T11:15:38+00:00" }, { "name": "symfony/monolog-bundle", @@ -4449,16 +4382,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223" + "reference": "f5191eb0e98e08d12eb49fc0ed0820e37de89fdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/bc9974e74f8c05f4ceb500b1e0603e36be7d8223", - "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/f5191eb0e98e08d12eb49fc0ed0820e37de89fdf", + "reference": "f5191eb0e98e08d12eb49fc0ed0820e37de89fdf", "shasum": "" }, "require": { @@ -4467,7 +4400,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4519,20 +4452,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", "shasum": "" }, "require": { @@ -4544,7 +4477,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4595,20 +4528,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" + "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024", + "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024", "shasum": "" }, "require": { @@ -4620,7 +4553,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4672,32 +4605,33 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "af1842919c7e7364aaaa2798b29839e3ba168588" + "reference": "c44d5bf6a75eed79555c6bf37505c6d39559353e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/af1842919c7e7364aaaa2798b29839e3ba168588", - "reference": "af1842919c7e7364aaaa2798b29839e3ba168588", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/c44d5bf6a75eed79555c6bf37505c6d39559353e", + "reference": "c44d5bf6a75eed79555c6bf37505c6d39559353e", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.1", + "symfony/intl": "~2.3|~3.0|~4.0|~5.0" }, "suggest": { - "ext-intl": "For best performance and support of other locales than \"en\"" + "ext-intl": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4707,15 +4641,6 @@ "autoload": { "files": [ "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Icu\\": "" - }, - "classmap": [ - "Resources/stubs" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4756,20 +4681,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", "shasum": "" }, "require": { @@ -4783,7 +4708,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4840,20 +4765,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "727d1096295d807c309fb01a851577302394c897" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", + "reference": "727d1096295d807c309fb01a851577302394c897", "shasum": "" }, "require": { @@ -4865,7 +4790,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4921,20 +4846,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", "shasum": "" }, "require": { @@ -4946,7 +4871,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4998,7 +4923,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php54", @@ -5262,16 +5187,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", "shasum": "" }, "require": { @@ -5280,7 +5205,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5331,20 +5256,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed", + "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed", "shasum": "" }, "require": { @@ -5353,7 +5278,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5407,20 +5332,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.22.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "5caa5b2bacaa12a508697d95b303954f442cc7f1" + "reference": "fd2008fac0a11ae100537406d95887d5a9155e4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/5caa5b2bacaa12a508697d95b303954f442cc7f1", - "reference": "5caa5b2bacaa12a508697d95b303954f442cc7f1", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/fd2008fac0a11ae100537406d95887d5a9155e4f", + "reference": "fd2008fac0a11ae100537406d95887d5a9155e4f", "shasum": "" }, "require": { @@ -5429,7 +5354,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5477,7 +5402,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2020-10-24T08:53:22+00:00" }, { "name": "symfony/security-acl", @@ -6134,31 +6059,89 @@ "abandoned": "laminas/laminas-eventmanager", "time": "2018-04-25T15:33:34+00:00" }, + { + "name": "zendframework/zend-hydrator", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-hydrator.git", + "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", + "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.0@dev", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + }, + "suggest": { + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", + "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage", + "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-1.0": "1.0-dev", + "dev-release-1.1": "1.1-dev", + "dev-master": "2.0-dev", + "dev-develop": "2.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Hydrator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-hydrator", + "keywords": [ + "hydrator", + "zf2" + ], + "abandoned": "laminas/laminas-hydrator", + "time": "2016-02-18T22:38:26+00:00" + }, { "name": "zendframework/zend-ldap", - "version": "2.10.1", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-ldap.git", - "reference": "525ec97cd18a42a953c6a78c1019f967d2539b88" + "reference": "c647a86224030543401634dbafd514074b49b2b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-ldap/zipball/525ec97cd18a42a953c6a78c1019f967d2539b88", - "reference": "525ec97cd18a42a953c6a78c1019f967d2539b88", + "url": "https://api.github.com/repos/zendframework/zend-ldap/zipball/c647a86224030543401634dbafd514074b49b2b6", + "reference": "c647a86224030543401634dbafd514074b49b2b6", "shasum": "" }, "require": { "ext-ldap": "*", - "php": "^5.6 || ^7.0" + "php": ">=5.3.23", + "zendframework/zend-stdlib": "~2.5" }, "require-dev": { - "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.5", - "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5", + "zendframework/zend-eventmanager": "~2.5" }, "suggest": { "zendframework/zend-eventmanager": "Zend\\EventManager component" @@ -6166,8 +6149,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" } }, "autoload": { @@ -6179,17 +6162,242 @@ "license": [ "BSD-3-Clause" ], - "description": "Provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory", + "description": "provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory", + "homepage": "https://github.com/zendframework/zend-ldap", "keywords": [ - "ZendFramework", "ldap", - "zf" + "zf2" ], "abandoned": "laminas/laminas-ldap", - "time": "2019-10-17T16:26:26+00:00" + "time": "2015-06-03T15:32:02+00:00" + }, + { + "name": "zendframework/zend-stdlib", + "version": "2.7.7", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f", + "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-hydrator": "~1.1" + }, + "require-dev": { + "athletic/athletic": "~0.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5", + "zendframework/zend-eventmanager": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-inputfilter": "~2.5", + "zendframework/zend-serializer": "~2.5", + "zendframework/zend-servicemanager": "~2.5" + }, + "suggest": { + "zendframework/zend-eventmanager": "To support aggregate hydrator usage", + "zendframework/zend-filter": "To support naming strategy hydrator usage", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-2.7": "2.7-dev", + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-stdlib", + "keywords": [ + "stdlib", + "zf2" + ], + "abandoned": "laminas/laminas-stdlib", + "time": "2016-04-12T21:17:31+00:00" } ], "packages-dev": [ + { + "name": "ddeboer/data-import", + "version": "0.18.0", + "source": { + "type": "git", + "url": "https://github.com/ddeboer/data-import.git", + "reference": "cbae2f570192b738c5cec835fbf583a75c52d535" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ddeboer/data-import/zipball/cbae2f570192b738c5cec835fbf583a75c52d535", + "reference": "cbae2f570192b738c5cec835fbf583a75c52d535", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "~1.0" + }, + "require-dev": { + "doctrine/dbal": "*", + "doctrine/orm": "*", + "ext-iconv": "*", + "ext-mbstring": "*", + "ext-sqlite3": "*", + "phpoffice/phpexcel": "*", + "symfony/console": "~2.5.0", + "symfony/property-access": "*", + "symfony/validator": "~2.3.0" + }, + "suggest": { + "doctrine/dbal": "If you want to use the DbalReader", + "ext-iconv": "For the CharsetValueConverter", + "ext-mbstring": "For the CharsetValueConverter", + "phpoffice/phpexcel": "If you want to use the ExcelReader", + "symfony/console": "If you want to use the ConsoleProgressWriter", + "symfony/property-access": "If you want to use the ObjectConverter", + "symfony/validator": "to use the ValidatorFilter" + }, + "type": "library", + "autoload": { + "psr-0": { + "Ddeboer\\DataImport": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "The community", + "homepage": "https://github.com/ddeboer/data-import/graphs/contributors" + }, + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Import data from, and export data to, a range of file formats and media", + "keywords": [ + "csv", + "data", + "doctrine", + "excel", + "export", + "import" + ], + "time": "2015-04-21T14:06:20+00:00" + }, + { + "name": "guzzle/guzzle", + "version": "v3.9.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" + }, + "suggest": { + "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.9-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "abandoned": "guzzlehttp/guzzle", + "time": "2015-03-18T18:23:50+00:00" + }, { "name": "liip/functional-test-bundle", "version": "1.10.0", @@ -6872,6 +7080,75 @@ "abandoned": true, "time": "2017-06-30T09:13:00+00:00" }, + { + "name": "satooshi/php-coveralls", + "version": "v0.6.1", + "source": { + "type": "git", + "url": "https://github.com/satooshi/php-coveralls.git", + "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760", + "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-simplexml": "*", + "guzzle/guzzle": ">=3.0", + "php": ">=5.3", + "psr/log": "1.0.0", + "symfony/config": ">=2.0", + "symfony/console": ">=2.0", + "symfony/stopwatch": ">=2.2", + "symfony/yaml": ">=2.0" + }, + "require-dev": { + "apigen/apigen": "2.8.*@stable", + "pdepend/pdepend": "dev-master", + "phpmd/phpmd": "dev-master", + "phpunit/php-invoker": ">=1.1.0,<1.2.0", + "phpunit/phpunit": "3.7.*@stable", + "sebastian/finder-facade": "dev-master", + "sebastian/phpcpd": "1.4.*@stable", + "squizlabs/php_codesniffer": "1.4.*@stable", + "theseer/fdomdocument": "dev-master" + }, + "bin": [ + "composer/bin/coveralls" + ], + "type": "library", + "autoload": { + "psr-0": { + "Contrib\\Component": "src/", + "Contrib\\Bundle": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/satooshi/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "abandoned": "php-coveralls/php-coveralls", + "time": "2013-05-04T08:07:33+00:00" + }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.2", @@ -7390,6 +7667,55 @@ "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "sensio/generator-bundle", + "version": "v2.5.3", + "target-dir": "Sensio/Bundle/GeneratorBundle", + "source": { + "type": "git", + "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", + "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", + "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", + "shasum": "" + }, + "require": { + "symfony/console": "~2.5", + "symfony/framework-bundle": "~2.2" + }, + "require-dev": { + "doctrine/orm": "~2.2,>=2.2.3", + "symfony/doctrine-bridge": "~2.2", + "twig/twig": "~1.11" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.5.x-dev" + } + }, + "autoload": { + "psr-0": { + "Sensio\\Bundle\\GeneratorBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you", + "abandoned": "symfony/maker-bundle", + "time": "2015-03-17T06:36:52+00:00" } ], "aliases": [], @@ -7399,12 +7725,13 @@ "fr3d/ldap-bundle": 20, "nfq-alpha/sprite-bundle": 20, "partkeepr/extjs6": 20, - "partkeepr/remote-file-loader": 20 + "partkeepr/remote-file-loader": 20, + "nelmio/api-doc-bundle": 20 }, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "7.1.33" + "php": ">=5.6.0" }, "platform-dev": [], "plugin-api-version": "1.1.0" From 57ff56ecab3c28fc8d38d10e1c96eecf9566da00 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 2 May 2021 20:46:31 +0200 Subject: [PATCH 014/140] nelmio/api-doc-bundle to 2.10.0 --- composer.json | 2 +- composer.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index d55984fc9..ff9a726fd 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", - "nelmio/api-doc-bundle": "~2.9@dev" + "nelmio/api-doc-bundle": "2.10.0" }, "require-dev": { "phpunit/phpunit": "5.7.27", diff --git a/composer.lock b/composer.lock index 8643d61ab..797b6fa86 100644 --- a/composer.lock +++ b/composer.lock @@ -2626,17 +2626,17 @@ }, { "name": "nelmio/api-doc-bundle", - "version": "dev-master", + "version": "2.10.0", "target-dir": "Nelmio/ApiDocBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "9af37448fa2f82856d068205afa96e9874527672" + "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/9af37448fa2f82856d068205afa96e9874527672", - "reference": "9af37448fa2f82856d068205afa96e9874527672", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/fb863954d8aec29bdc6d9b2b03f15759d4bf2995", + "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995", "shasum": "" }, "require": { From 0ce010a7ba60b17426e267ec6f02bed32c9dc857 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 3 May 2021 19:18:36 +0200 Subject: [PATCH 015/140] nelmio/api-doc-bundle to 2.10.3 --- composer.json | 2 +- composer.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index ff9a726fd..9b58f317c 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", - "nelmio/api-doc-bundle": "2.10.0" + "nelmio/api-doc-bundle": "2.10.3" }, "require-dev": { "phpunit/phpunit": "5.7.27", diff --git a/composer.lock b/composer.lock index 797b6fa86..0c0e944f2 100644 --- a/composer.lock +++ b/composer.lock @@ -2626,17 +2626,17 @@ }, { "name": "nelmio/api-doc-bundle", - "version": "2.10.0", + "version": "2.10.3", "target-dir": "Nelmio/ApiDocBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995" + "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/fb863954d8aec29bdc6d9b2b03f15759d4bf2995", - "reference": "fb863954d8aec29bdc6d9b2b03f15759d4bf2995", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/be90e8aad60b7701097b900c4a3a971a50f9862e", + "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e", "shasum": "" }, "require": { From f0d38d00e16518079bffb82d60399ef6530b9c04 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 3 May 2021 20:47:54 +0200 Subject: [PATCH 016/140] nelmio/api-doc-bundle to 2.13.5 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 9b58f317c..8f0091491 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", - "nelmio/api-doc-bundle": "2.10.3" + "nelmio/api-doc-bundle": "2.13.5" }, "require-dev": { "phpunit/phpunit": "5.7.27", diff --git a/composer.lock b/composer.lock index 0c0e944f2..6d342034b 100644 --- a/composer.lock +++ b/composer.lock @@ -2626,24 +2626,24 @@ }, { "name": "nelmio/api-doc-bundle", - "version": "2.10.3", + "version": "2.13.5", "target-dir": "Nelmio/ApiDocBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e" + "reference": "158149568863c688abfa3df94037257bbed628ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/be90e8aad60b7701097b900c4a3a971a50f9862e", - "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/158149568863c688abfa3df94037257bbed628ed", + "reference": "158149568863c688abfa3df94037257bbed628ed", "shasum": "" }, "require": { "michelf/php-markdown": "~1.4", - "symfony/console": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/twig-bundle": "~2.3" + "symfony/console": "~2.3|~3.0|~4.0", + "symfony/framework-bundle": "~2.3|~3.0|~4.0", + "symfony/twig-bundle": "~2.3|~3.0|~4.0" }, "conflict": { "jms/serializer": "<0.12", From 5fc27d70b5a6a6bc05295e707d71f6d5992808c0 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 9 May 2021 10:56:13 +0200 Subject: [PATCH 017/140] EscapeWSSEAuthenticationBundle to v2.3.0 and back to original repository I didn't test that wss is working (I'm using https) --- composer.json | 2 +- composer.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 8f0091491..c425dba46 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,7 @@ "twig/twig": "v1.42.2", "api-platform/core": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", - "escapestudios/wsse-authentication-bundle": "dev-advancedUserInterface", + "escapestudios/wsse-authentication-bundle": "2.3.0", "fr3d/ldap-bundle": "dev-master", "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", diff --git a/composer.lock b/composer.lock index 6d342034b..40edcb9ad 100644 --- a/composer.lock +++ b/composer.lock @@ -1518,17 +1518,17 @@ }, { "name": "escapestudios/wsse-authentication-bundle", - "version": "dev-advancedUserInterface", + "version": "2.3.0", "target-dir": "Escape/WSSEAuthenticationBundle", "source": { "type": "git", - "url": "https://github.com/Drachenkaetzchen/EscapeWSSEAuthenticationBundle.git", - "reference": "f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a" + "url": "https://github.com/escapestudios/EscapeWSSEAuthenticationBundle", + "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Drachenkaetzchen/EscapeWSSEAuthenticationBundle/zipball/f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a", - "reference": "f0f75ff74a1fcb960d7b1f39dd10600f8cdaa20a", + "url": "https://api.github.com/repos/djoos/EscapeWSSEAuthenticationBundle/zipball/fe5585f20570c89a3e6f9b889104c1263a734a22", + "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22", "shasum": "" }, "require": { From 640fc4871834dce248bcaef1f446a0537143b449 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 9 May 2021 17:42:07 +0200 Subject: [PATCH 018/140] fr3d/ldap-bundle back to original git + v3.0.0 custom enabled removed --- app/config/config_ldap.yml | 2 +- app/config/parameters.php.dist | 2 +- composer.json | 2 +- composer.lock | 10 +++++----- .../SetupBundle/Services/ConfigSetupService.php | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/config/config_ldap.yml b/app/config/config_ldap.yml index 1b0e41551..b3d97f826 100644 --- a/app/config/config_ldap.yml +++ b/app/config/config_ldap.yml @@ -14,7 +14,7 @@ fr3d_ldap: accountDomainName: "%fr3d_ldap.driver.accountDomainName%" accountDomainNameShort: "%fr3d_ldap.driver.accountDomainNameShort%" user: - enabled: "%fr3d_ldap.user.enabled%" +# enabled: "%fr3d_ldap.user.enabled%" baseDn: "%fr3d_ldap.user.baseDn%" filter: "%fr3d_ldap.user.filter%" attributes: diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist index 90cdc8820..9f29a4f61 100644 --- a/app/config/parameters.php.dist +++ b/app/config/parameters.php.dist @@ -120,7 +120,7 @@ $container->setParameter('fr3d_ldap.driver.accountDomainName', null); $container->setParameter('fr3d_ldap.driver.accountDomainNameShort', null); // set to true to enable LDAP -$container->setParameter('fr3d_ldap.user.enabled', false); +#$container->setParameter('fr3d_ldap.user.enabled', false); // sets the base DN $container->setParameter('fr3d_ldap.user.baseDn', 'dc=blabla,dc=com'); diff --git a/composer.json b/composer.json index c425dba46..75f07fbce 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "api-platform/core": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", "escapestudios/wsse-authentication-bundle": "2.3.0", - "fr3d/ldap-bundle": "dev-master", + "fr3d/ldap-bundle": "v3.0.0", "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", diff --git a/composer.lock b/composer.lock index 40edcb9ad..e72f8643d 100644 --- a/composer.lock +++ b/composer.lock @@ -1641,16 +1641,16 @@ }, { "name": "fr3d/ldap-bundle", - "version": "dev-master", + "version": "v3.0.0", "source": { "type": "git", - "url": "https://github.com/partkeepr/FR3DLdapBundle.git", - "reference": "492a4ac6d2edf95aa0a252fbca4376aad42d05c1" + "url": "https://github.com/Maks3w/FR3DLdapBundle", + "reference": "5a8927c11af45fa06331b97221c6da1a4a237475" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/partkeepr/FR3DLdapBundle/zipball/492a4ac6d2edf95aa0a252fbca4376aad42d05c1", - "reference": "492a4ac6d2edf95aa0a252fbca4376aad42d05c1", + "url": "https://api.github.com/repos/Maks3w/FR3DLdapBundle/zipball/5a8927c11af45fa06331b97221c6da1a4a237475", + "reference": "5a8927c11af45fa06331b97221c6da1a4a237475", "shasum": "" }, "require": { diff --git a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php index 0b49cbbc4..5cfad23f6 100644 --- a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php +++ b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php @@ -65,7 +65,7 @@ public function getConfig($config) 'fr3d_ldap.driver.accountCanonicalForm' => null, 'fr3d_ldap.driver.accountDomainName' => null, 'fr3d_ldap.driver.accountDomainNameShort' => null, - 'fr3d_ldap.user.enabled' => false, +# 'fr3d_ldap.user.enabled' => false, 'fr3d_ldap.user.baseDn' => 'dc=example,dc=com', 'fr3d_ldap.user.filter' => null, 'fr3d_ldap.user.attribute.username' => 'samaccountname', From 072b62bae8bcb98cd4e0e6cd552dbf48e636a172 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 9 May 2021 17:54:00 +0200 Subject: [PATCH 019/140] fr3d/ldap-bundle to v3.0.2 --- composer.json | 2 +- composer.lock | 38 +++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 75f07fbce..e6a53c9f1 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "api-platform/core": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", "escapestudios/wsse-authentication-bundle": "2.3.0", - "fr3d/ldap-bundle": "v3.0.0", + "fr3d/ldap-bundle": "v3.0.2", "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", diff --git a/composer.lock b/composer.lock index e72f8643d..8b30422bf 100644 --- a/composer.lock +++ b/composer.lock @@ -1641,31 +1641,35 @@ }, { "name": "fr3d/ldap-bundle", - "version": "v3.0.0", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/Maks3w/FR3DLdapBundle", - "reference": "5a8927c11af45fa06331b97221c6da1a4a237475" + "reference": "2309156974e02a8a1398fe491627e1a84da39e67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maks3w/FR3DLdapBundle/zipball/5a8927c11af45fa06331b97221c6da1a4a237475", - "reference": "5a8927c11af45fa06331b97221c6da1a4a237475", + "url": "https://api.github.com/repos/Maks3w/FR3DLdapBundle/zipball/2309156974e02a8a1398fe491627e1a84da39e67", + "reference": "2309156974e02a8a1398fe491627e1a84da39e67", "shasum": "" }, - "require": { - "ext-ldap": "*", - "php": ">=5.3.2", - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/security": "~2.1", - "symfony/security-bundle": "~2.1", - "zendframework/zend-ldap": "~2" - }, - "require-dev": { - "fabpot/php-cs-fixer": "*", - "phpunit/phpunit": "~4", - "symfony/validator": "~2.1" + "require" : { + "php" : ">=5.5", + "psr/log" : "~1.0", + "symfony/config" : "2.3 - 3", + "symfony/dependency-injection" : "2.3 - 3", + "symfony/polyfill-php56" : "^1.1", + "symfony/security" : "2.3 - 3", + "symfony/security-bundle" : "2.3 - 3", + "zendframework/zend-ldap" : "2.5 - 3" + }, + "require-dev" : { + "fabpot/php-cs-fixer" : "1.11.*", + "fr3d/psr3-message-assertions" : "0.1.*", + "friendsofsymfony/user-bundle" : "~1.3", + "maks3w/phpunit-methods-trait" : "^4.6", + "phpunit/phpunit" : "^4.6", + "symfony/validator" : "2.3 - 3" }, "suggest": { "friendsofsymfony/user-bundle": "Integrate authentication and management for DB users, useful for unmanaged LDAP servers", From 15d38e2c1baaff67694c87a0b616117ad4069fa3 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 May 2021 09:37:19 +0200 Subject: [PATCH 020/140] update fr3d/ldap-bundle in the repository section of composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 composer.json diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index e6a53c9f1..3b819d242 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ }, { "type": "vcs", - "url": "https://github.com/partkeepr/FR3DLdapBundle" + "url": "https://github.com/Maks3wFR3DLdapBundle" }, { "type": "vcs", From 5fa865de0df4e9e26d0ba817e2014cdafaf8fca6 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 May 2021 09:39:50 +0200 Subject: [PATCH 021/140] update EscapeWSSEAuthenticationBundle in the repository section of composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b819d242..7a2894a2e 100755 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/felicitus/EscapeWSSEAuthenticationBundle" + "url": "https://github.com/escapestudiosEscapeWSSEAuthenticationBundle" }, { "type": "vcs", From 107bb183efbd66ebd7e98c9e29dfebccab352590 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 May 2021 09:45:43 +0200 Subject: [PATCH 022/140] eclipe prj renamed --- .project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.project b/.project index 01430219b..fc756133c 100755 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - PartUp + partkeepr From 4f3381e7916f9b246ba425d42e08141797174e9a Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 May 2021 13:49:50 +0200 Subject: [PATCH 023/140] dunglas client_can_change upgrade --- app/config/config.yml | 7 +++++-- app/config/config_dunglas.yml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index ce7d1cad5..7ec1536e9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -55,9 +55,12 @@ dunglas_api: title: "PartKeepr" description: "The PartKeepr REST API" collection: + order_parameter_name: 'order' + order: 'ASC' pagination: - items_per_page: - client_can_change: true + client_enabled: true + client_items_per_page: true +# items_per_page: 3 sprite_generator: sprites: diff --git a/app/config/config_dunglas.yml b/app/config/config_dunglas.yml index 6380f97a9..81c88b3fd 100644 --- a/app/config/config_dunglas.yml +++ b/app/config/config_dunglas.yml @@ -2,8 +2,11 @@ dunglas_api: title: "PartKeepr" description: "The PartKeepr REST API" collection: + order_parameter_name: 'order' + order: 'ASC' pagination: - items_per_page: - client_can_change: true + client_enabled: true + client_items_per_page: true +# items_per_page: 3 supported_formats: [ "jsonld", "csv", "xlsx" ] cache: %cache.dunglas% From 4d579227659464f70e27be4005a9c79f424da2f5 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 18:24:24 +0200 Subject: [PATCH 024/140] BREAK - go for api_platform v2 --- composer.json | 10 +- composer.lock | 445 ++++++++++++++++++++------------------------------ 2 files changed, 181 insertions(+), 274 deletions(-) diff --git a/composer.json b/composer.json index 7a2894a2e..a995143f6 100755 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "doctrine/migrations": "v1.2.2", "doctrine/orm": "v2.5.14", "fortawesome/font-awesome": "5.15.1", - "friendsofsymfony/rest-bundle": "1.7.7", + "friendsofsymfony/rest-bundle": "2.0.1", "friendsofsymfony/user-bundle": "v2.1.2", "guzzlehttp/guzzle": "6.5.5", "imagine/imagine": "1.2.4", @@ -58,7 +58,7 @@ "predis/predis": "v1.1.6", "ramsey/uuid": "3.9.3", "reputation-vip/composer-assets-installer": "1.0.4", - "sensio/distribution-bundle": "v4.0.42", + "sensio/distribution-bundle": "v5.0.25", "sensio/framework-extra-bundle": "v3.0.29", "sonata-project/exporter": "1.7.1", "snc/redis-bundle": "2.1.13", @@ -67,11 +67,11 @@ "symfony/monolog-bundle": "v3.3.1", "symfony/property-access": "v2.8.52", "symfony/swiftmailer-bundle": "v3.0.3", - "symfony/symfony": "v2.8.52", + "symfony/symfony": "v3.3.1", "twig/extensions": "v1.5.4", "twig/twig": "v1.42.2", - - "api-platform/core": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", + + "api-platform/core": "dev-main#63c880f975435c3cb04512f1d6367a17dad9ff0d", "escapestudios/wsse-authentication-bundle": "2.3.0", "fr3d/ldap-bundle": "v3.0.2", "nfq-alpha/sprite-bundle": "dev-min-image-fix", diff --git a/composer.lock b/composer.lock index 8b30422bf..5328498be 100644 --- a/composer.lock +++ b/composer.lock @@ -1319,48 +1319,109 @@ ], "time": "2017-12-17T02:57:51+00:00" }, + { + "name": "psr/cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "shasum": "" + }, + "require": { + "willdurand/negotiation": "^2.0.3" + }, + "require-dev": { + "psr/log": "^1.0" + }, + "type": "psr/cache", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { "ApiPlatform\\Core\\": "src/" } + }, + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com", + "homepage": "http://dunglas.fr" + } + ], + "description": "JSON-LD / Hydra REST API for Symfony", + "homepage": "http://api-platform.com", + "keywords": [ + "rest" + ], + "time": "2015-09-23T13:09:28+00:00" + }, { "name": "api-platform/core", - "version": "dev-main#3815fde6b7f29d52af40327308755124a1d640a0", + "version": "dev-main#63c880f975435c3cb04512f1d6367a17dad9ff0d", "source": { "type": "git", "url": "https://github.com/api-platform/core.git", - "reference": "3815fde6b7f29d52af40327308755124a1d640a0" + "reference": "63c880f975435c3cb04512f1d6367a17dad9ff0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/3815fde6b7f29d52af40327308755124a1d640a0", - "reference": "3815fde6b7f29d52af40327308755124a1d640a0", + "url": "https://api.github.com/repos/api-platform/core/zipball/63c880f975435c3cb04512f1d6367a17dad9ff0d", + "reference": "63c880f975435c3cb04512f1d6367a17dad9ff0d", "shasum": "" }, "require": { - "doctrine/doctrine-bundle": "~1.2", - "doctrine/inflector": "~1.0", - "doctrine/orm": "~2.2,>=2.2.3", - "dunglas/php-property-info": "~0.2", - "ocramius/proxy-manager": "~1.0", - "php": ">=5.5", - "phpdocumentor/reflection": "^1.0.7", - "symfony/framework-bundle": "~2.6|~3.0", - "symfony/proxy-manager-bridge": "~2.3", - "symfony/serializer": "^2.7.2|~3.0", - "symfony/validator": "~2.5|~3.0", - "willdurand/negotiation": "~1.4" + "php": ">=7.0", + "doctrine/inflector": "^1.0", + "psr/cache": "^1.0", + "symfony/http-foundation": "^2.7 || ^3.0", + "symfony/http-kernel": "^2.7 || ^3.0", + "symfony/serializer": "^3.1", + "willdurand/negotiation": "^2.0.3" }, "require-dev": { - "behat/behat": "~3.0", - "behat/mink": "~1.5", - "behat/mink-browserkit-driver": "~1.1", - "behat/mink-extension": "~2.0", - "behat/symfony2-extension": "~2.0", - "behatch/contexts": "dev-master", - "friendsofsymfony/user-bundle": "~1.3", - "phpunit/phpunit": "~4.6", - "symfony/finder": "~2.3", - "symfony/security": "~2.7.2|~3.0" + "behat/behat": "^3.1", + "behat/mink": "^1.7", + "behat/mink-browserkit-driver": "^1.3.1", + "behat/mink-extension": "^2.2", + "behat/symfony2-extension": "^2.1", + "behatch/contexts": "^2.5", + "doctrine/doctrine-bundle": "^1.6.3", + "doctrine/orm": "^2.5", + "doctrine/annotations": "^1.2", + "friendsofsymfony/user-bundle": "^2.0@dev", + "nelmio/api-doc-bundle": "^2.11.2", + "php-mock/php-mock-phpunit": "^1.1", + "phpdocumentor/reflection-docblock": "^3.0", + "phpdocumentor/type-resolver": "^0.2", + "phpunit/phpunit": "^5.6.8", + "psr/log": "^1.0", + "symfony/asset": "^2.7 || ^3.0", + "symfony/cache": "^3.1", + "symfony/config": "^2.7 || ^3.0", + "symfony/dependency-injection": "^2.7 || ^3.0", + "symfony/doctrine-bridge": "^2.8 || ^3.0", + "symfony/phpunit-bridge": "^2.7 || ^3.0", + "symfony/security": "^2.7 || ^3.0", + "symfony/templating": "^2.7 || ^3.0", + "symfony/validator": "^2.7 || ^3.0", + "symfony/finder": "^2.7 || ^3.0", + "symfony/framework-bundle": "^3.1", + "symfony/twig-bundle": "^2.8 || ^3.1" }, "suggest": { - "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge." + "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.", + "phpdocumentor/reflection-docblock": "To support extracting metadata from PHPDoc.", + "psr/cache-implementation": "To use metadata caching.", + "symfony/cache": "To have metadata caching when using Symfony integration.", + "symfony/config": "To load XML configuration files.", + "symfony/twig-bundle": "To use the Swagger UI integration." }, "type": "symfony-bundle", "extra": { @@ -1369,9 +1430,7 @@ } }, "autoload": { - "psr-4": { - "Dunglas\\ApiBundle\\": "" - } + "psr-4": { "ApiPlatform\\Core\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1534,11 +1593,11 @@ "require": { "doctrine/common": "~2.2", "php": ">=5.3.2", - "symfony/framework-bundle": "~2.3", - "symfony/security-bundle": "~2.3" + "symfony/framework-bundle": "~3.3", + "symfony/security-bundle": "~3.3" }, "require-dev": { - "symfony/finder": "~2.3" + "symfony/finder": "~3.3" }, "type": "symfony-bundle", "extra": { @@ -1703,47 +1762,49 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "1.7.7", + "version": "2.0.1", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "c79b7e5df96e5581591ceb6a026bd4e5f9346de0" + "reference": "183989449865836c08347f8e0e54e1f3aa9c45f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/c79b7e5df96e5581591ceb6a026bd4e5f9346de0", - "reference": "c79b7e5df96e5581591ceb6a026bd4e5f9346de0", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/183989449865836c08347f8e0e54e1f3aa9c45f0", + "reference": "183989449865836c08347f8e0e54e1f3aa9c45f0", "shasum": "" }, "require": { - "doctrine/inflector": "~1.0", - "php": "^5.3.9|~7.0", - "psr/log": "~1.0", - "symfony/framework-bundle": "~2.3|~3.0", - "symfony/http-kernel": "^2.3.24|~3.0", - "willdurand/jsonp-callback-validator": "~1.0", - "willdurand/negotiation": "~1.2" + "php": "^5.5.9|~7.0", + "psr/log": "^1.0", + "symfony/framework-bundle": "^2.7|^3.0", + "symfony/finder": "^2.7|^3.0", + "symfony/routing": "^2.7|^3.0", + "doctrine/inflector": "^1.0", + "willdurand/negotiation": "^2.0", + "willdurand/jsonp-callback-validator": "^1.0" }, "conflict": { - "jms/serializer": "<0.12", - "jms/serializer-bundle": "<0.11", - "symfony/validator": ">=2.5.0,<2.5.5" + "sensio/framework-extra-bundle": "<3.0.13", + "jms/serializer": "1.3.0" }, "require-dev": { - "jms/serializer": "~0.13|~1.0", - "jms/serializer-bundle": "~0.12|~1.0", - "phpoption/phpoption": "~1.1.0", - "sensio/framework-extra-bundle": "~2.0|~3.0", - "sllh/php-cs-fixer-styleci-bridge": "^1.3", - "symfony/browser-kit": "~2.3|~3.0", - "symfony/dependency-injection": "~2.3|~3.0", - "symfony/form": "~2.3|~3.0", - "symfony/phpunit-bridge": "~2.7|~3.0", - "symfony/security": "~2.3|~3.0", - "symfony/serializer": "~2.3|~3.0", - "symfony/validator": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0" + "sensio/framework-extra-bundle": "^3.0.13", + "symfony/phpunit-bridge": "~2.7|^3.0", + "symfony/form": "^2.7|^3.0", + "symfony/validator": "^2.7|^3.0", + "symfony/serializer": "^2.7.11|^3.0.4", + "symfony/yaml": "^2.7|^3.0", + "symfony/security-bundle": "^2.7|^3.0", + "symfony/web-profiler-bundle": "^2.7|^3.0", + "symfony/twig-bundle": "^2.7|^3.0", + "symfony/browser-kit": "^2.7|^3.0", + "symfony/dependency-injection": "^2.7|^3.0", + "symfony/expression-language": "~2.7|^3.0", + "symfony/css-selector": "^2.7|^3.0", + "phpoption/phpoption": "^1.1", + "jms/serializer-bundle": "^1.0" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0", @@ -3553,7 +3614,7 @@ }, "require": { "composer-plugin-api": "~1.0", - "symfony/filesystem": "^2.0" + "symfony/filesystem": "^3.0" }, "require-dev": { "composer/composer": "1.0.x-dev", @@ -3579,30 +3640,27 @@ }, { "name": "sensio/distribution-bundle", - "version": "v4.0.42", - "target-dir": "Sensio/Bundle/DistributionBundle", + "version": "v5.0.25", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "71fdc7d57538f17eedf3c548c91ab214c694a9c0" + "reference": "80a38234bde8321fb92aa0b8c27978a272bb4baf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/71fdc7d57538f17eedf3c548c91ab214c694a9c0", - "reference": "71fdc7d57538f17eedf3c548c91ab214c694a9c0", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/80a38234bde8321fb92aa0b8c27978a272bb4baf", + "reference": "80a38234bde8321fb92aa0b8c27978a272bb4baf", "shasum": "" }, "require": { "php": ">=5.3.9", - "sensiolabs/security-checker": "~3.0|~4.0|~5.0|~6.0", - "symfony/class-loader": "~2.2", - "symfony/framework-bundle": "~2.3", - "symfony/process": "~2.2" - }, - "require-dev": { - "symfony/form": "~2.2", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/config": "~2.3|~3.0", + "symfony/filesystem": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/class-loader": "~2.3|~3.0", + "symfony/process": "~2.3|~3.0", + "sensiolabs/security-checker": "~5.0|~6.0" }, "suggest": { "symfony/form": "If you want to use the configurator", @@ -3612,13 +3670,11 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\DistributionBundle": "" - } + "psr-4": { "Sensio\\Bundle\\DistributionBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3724,7 +3780,7 @@ }, "require": { "php": ">=7.1.3", - "symfony/console": "^2.8|^3.4|^4.2|^5.0", + "symfony/console": "^2.8|^3.3|^3.4|^4.2|^5.0", "symfony/http-client": "^4.3|^5.0", "symfony/mime": "^4.3|^5.0", "symfony/polyfill-ctype": "^1.11" @@ -5606,16 +5662,16 @@ }, { "name": "symfony/symfony", - "version": "v2.8.52", + "version": "v3.4.10", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "88f3ef62d6ab870128352c8686c7889562698faf" + "reference": "816bf5030e3ac7cf6a88575a27138a088d3041b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/88f3ef62d6ab870128352c8686c7889562698faf", - "reference": "88f3ef62d6ab870128352c8686c7889562698faf", + "url": "https://api.github.com/repos/symfony/symfony/zipball/816bf5030e3ac7cf6a88575a27138a088d3041b0", + "reference": "816bf5030e3ac7cf6a88575a27138a088d3041b0", "shasum": "" }, "require": { @@ -5908,16 +5964,16 @@ }, { "name": "willdurand/negotiation", - "version": "1.5.0", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "2a59f2376557303e3fa91465ab691abb82945edf" + "reference": "1ebc51dd6d47f4037b0d2493335304e5aea50ab6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/2a59f2376557303e3fa91465ab691abb82945edf", - "reference": "2a59f2376557303e3fa91465ab691abb82945edf", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/1ebc51dd6d47f4037b0d2493335304e5aea50ab6", + "reference": "1ebc51dd6d47f4037b0d2493335304e5aea50ab6", "shasum": "" }, "require": { @@ -6306,102 +6362,6 @@ ], "time": "2015-04-21T14:06:20+00:00" }, - { - "name": "guzzle/guzzle", - "version": "v3.9.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "abandoned": "guzzlehttp/guzzle", - "time": "2015-03-18T18:23:50+00:00" - }, { "name": "liip/functional-test-bundle", "version": "1.10.0", @@ -7085,52 +7045,51 @@ "time": "2017-06-30T09:13:00+00:00" }, { - "name": "satooshi/php-coveralls", - "version": "v0.6.1", + "name": "php-coveralls/php-coveralls", + "version": "v2.4.3", "source": { "type": "git", - "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760" + "url": "https://github.com/php-coveralls/php-coveralls.git", + "reference": "909381bd40a17ae6e9076051f0d73293c1c091af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760", - "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760", + "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/909381bd40a17ae6e9076051f0d73293c1c091af", + "reference": "909381bd40a17ae6e9076051f0d73293c1c091af", "shasum": "" }, "require": { - "ext-curl": "*", + "php": "^5.5 || ^7.0 || ^8.0", "ext-json": "*", "ext-simplexml": "*", - "guzzle/guzzle": ">=3.0", - "php": ">=5.3", - "psr/log": "1.0.0", - "symfony/config": ">=2.0", - "symfony/console": ">=2.0", - "symfony/stopwatch": ">=2.2", - "symfony/yaml": ">=2.0" + "guzzlehttp/guzzle": "^6.0 || ^7.0", + "psr/log": "^1.0", + "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0", + "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0", + "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0", + "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "apigen/apigen": "2.8.*@stable", - "pdepend/pdepend": "dev-master", - "phpmd/phpmd": "dev-master", - "phpunit/php-invoker": ">=1.1.0,<1.2.0", - "phpunit/phpunit": "3.7.*@stable", - "sebastian/finder-facade": "dev-master", - "sebastian/phpcpd": "1.4.*@stable", - "squizlabs/php_codesniffer": "1.4.*@stable", - "theseer/fdomdocument": "dev-master" + "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" }, - "bin": [ - "composer/bin/coveralls" - ], - "type": "library", - "autoload": { - "psr-0": { - "Contrib\\Component": "src/", - "Contrib\\Bundle": "src/" - } + "bin": ["bin/php-coveralls"], + "scripts": { + "install-dev-tools": [ + "cd dev-tools && composer update --no-interaction" + ], + "sca": [ + "php dev-tools/vendor/bin/php-cs-fixer fix --dry-run -vv", + "php dev-tools/vendor/bin/phpmd src text build/config/phpmd.xml" + ] }, + "type": "library", + "autoload": { + "psr-4": { "PhpCoveralls\\": "src/"} + }, + "autoload-dev": { + "psr-4": { "PhpCoveralls\\Tests\\": "tests/"} + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -7671,66 +7630,14 @@ "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "sensio/generator-bundle", - "version": "v2.5.3", - "target-dir": "Sensio/Bundle/GeneratorBundle", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", - "shasum": "" - }, - "require": { - "symfony/console": "~2.5", - "symfony/framework-bundle": "~2.2" - }, - "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.5.x-dev" - } - }, - "autoload": { - "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle generates code for you", - "abandoned": "symfony/maker-bundle", - "time": "2015-03-17T06:36:52+00:00" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "escapestudios/wsse-authentication-bundle": 20, - "fr3d/ldap-bundle": 20, "nfq-alpha/sprite-bundle": 20, "partkeepr/extjs6": 20, - "partkeepr/remote-file-loader": 20, - "nelmio/api-doc-bundle": 20 + "partkeepr/remote-file-loader": 20 }, "prefer-stable": false, "prefer-lowest": false, From 2b08b29ac9f14b656599ca37688fce5c7c9dcc4b Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 18:26:27 +0200 Subject: [PATCH 025/140] phase 1 api resource migrate to annotation --- app/config/config_partkeepr.yml | 764 +++--------------- src/PartKeepr/AuthBundle/Entity/FOSUser.php | 9 + src/PartKeepr/AuthBundle/Entity/User.php | 27 + .../AuthBundle/Entity/UserPreference.php | 3 + .../AuthBundle/Entity/UserProvider.php | 9 + .../BatchJobBundle/Entity/BatchJob.php | 18 + .../Entity/BatchJobQueryField.php | 9 + .../Entity/BatchJobUpdateField.php | 9 + .../Entity/AbstractCategory.php | 2 + .../CoreBundle/Entity/BaseEntity.php | 2 + .../CoreBundle/Entity/SystemNotice.php | 16 + .../CronLoggerBundle/Entity/CronLogger.php | 3 + .../DistributorBundle/Entity/Distributor.php | 11 +- .../FootprintBundle/Entity/Footprint.php | 9 + .../Entity/FootprintAttachment.php | 17 + .../Entity/FootprintCategory.php | 22 + .../FootprintBundle/Entity/FootprintImage.php | 16 + .../FrontendBundle/Entity/GridPreset.php | 18 + .../ImageBundle/Entity/CachedImage.php | 3 + src/PartKeepr/ImageBundle/Entity/Image.php | 2 + .../ImageBundle/Entity/TempImage.php | 15 + .../ImportBundle/Entity/ImportPreset.php | 9 + .../Entity/Manufacturer.php | 9 + .../Entity/ManufacturerICLogo.php | 17 + .../Entity/MetaPartParameterCriteria.php | 11 + src/PartKeepr/PartBundle/Entity/Part.php | 24 + .../PartBundle/Entity/PartAttachment.php | 18 + .../PartBundle/Entity/PartCategory.php | 22 + .../PartBundle/Entity/PartDistributor.php | 8 + .../PartBundle/Entity/PartManufacturer.php | 8 + .../PartBundle/Entity/PartMeasurementUnit.php | 17 + .../PartBundle/Entity/PartParameter.php | 8 + .../ProjectBundle/Entity/Project.php | 10 + .../Entity/ProjectAttachment.php | 18 + .../ProjectBundle/Entity/ProjectPart.php | 9 + .../ProjectBundle/Entity/ProjectRun.php | 9 + .../ProjectBundle/Entity/ProjectRunPart.php | 9 + src/PartKeepr/ProjectBundle/Entity/Report.php | 21 + .../ProjectBundle/Entity/ReportPart.php | 9 + .../ProjectBundle/Entity/ReportProject.php | 9 + .../SiPrefixBundle/Entity/SiPrefix.php | 9 + .../StockBundle/Entity/StockEntry.php | 9 + .../Entity/StorageLocation.php | 12 +- .../Entity/StorageLocationCategory.php | 22 + .../Entity/StorageLocationImage.php | 16 + .../Entity/SystemPreference.php | 18 + .../TipOfTheDayBundle/Entity/TipOfTheDay.php | 21 + .../Entity/TipOfTheDayHistory.php | 12 + src/PartKeepr/UnitBundle/Entity/Unit.php | 9 + .../Entity/TempUploadedFile.php | 16 + .../Entity/UploadedFile.php | 2 + 51 files changed, 702 insertions(+), 673 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index d48fee196..20114d261 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,97 +92,25 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.distributor: - parent: "api.resource" - arguments: [ "PartKeepr\\DistributorBundle\Entity\Distributor" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.footprint: - parent: "api.resource" - arguments: [ "PartKeepr\FootprintBundle\Entity\Footprint" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - resource.batchjob.item_operation.execute: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: - - "@resource.batchjob" # Resource - - [ "PUT" ] # Methods - - "/batch_jobs/{id}/execute" # Path - - "partkeepr.batchjob.execute" # Controller - - "BatchJobExecute" # Route name - - resource.batchjob: - parent: "api.resource" - arguments: [ 'PartKeepr\BatchJobBundle\Entity\BatchJob' ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - method: "initItemOperations" - arguments: [ [ "@resource.batchjob.item_operation.get", "@resource.batchjob.item_operation.put", "@resource.batchjob.item_operation.delete", "@resource.batchjob.item_operation.execute" ] ] - - - - - - resource.batchjob_queryfield: - parent: "api.resource" - arguments: [ 'PartKeepr\BatchJobBundle\Entity\BatchJobQueryField' ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.batchjob_updatefield: - parent: "api.resource" - arguments: [ 'PartKeepr\BatchJobBundle\Entity\BatchJobUpdateField' ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - + - "@resource.batchjob" # Resource + - [ "PUT" ] # Methods + - "/batch_jobs/{id}/execute" # Path + - "partkeepr.batchjob.execute" # Controller + - "BatchJobExecute" # Route name resource.footprint_image.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.footprint_image", "GET" ] resource.footprint_image.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -196,23 +124,9 @@ services: "hydra:title": "A custom operation" "returns": "xmls:string" - resource.footprint_image: - parent: "api.resource" - arguments: [ "PartKeepr\FootprintBundle\Entity\FootprintImage" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.footprint_image.item_operation.get", "@resource.footprint_image.item_operation.custom_get" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.footprint_attachment.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -227,7 +141,7 @@ services: "returns": "xmls:string" resource.footprint_attachment.item_operation.custom_get_mime: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -242,28 +156,14 @@ services: "returns": "xmls:string" resource.footprint_attachment.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.footprint_attachment", "GET" ] - resource.footprint_attachment: - parent: "api.resource" - arguments: [ "PartKeepr\FootprintBundle\Entity\FootprintAttachment" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.footprint_attachment.item_operation.get", "@resource.footprint_attachment.item_operation.custom_get", "@resource.footprint_attachment.item_operation.custom_get_mime" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.footprint_category.item_operation.move: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -274,13 +174,13 @@ services: - "FootprintCategoryMove" # Route name resource.footprint_category.collection_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: [ "@resource.footprint_category", "GET" ] resource.footprint_category.collection_operation.get_root: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -291,71 +191,44 @@ services: - "PartKeeprFootprintCategoryGetRootNode" resource.footprint_category.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.footprint_category", "GET" ] resource.footprint_category.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.footprint_category", "PUT" ] resource.footprint_category.item_operation.delete: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.footprint_category", "DELETE" ] - resource.footprint_category: - parent: "api.resource" - arguments: [ "PartKeepr\FootprintBundle\Entity\FootprintCategory" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initCollectionOperations" - arguments: [ [ "@resource.footprint_category.collection_operation.get", "@resource.footprint_category.collection_operation.get_root", "@resource.footprint_category.collection_operation.post" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.footprint_category.item_operation.get", "@resource.footprint_category.item_operation.put", "@resource.footprint_category.item_operation.delete", "@resource.footprint_category.item_operation.move" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default", "tree" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default", "tree" ] } - - resource.import_preset: - parent: "api.resource" - arguments: [ "PartKeepr\ImportBundle\Entity\ImportPreset" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.grid_preset.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.grid_preset", "GET" ] resource.grid_preset.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.grid_preset", "PUT" ] resource.grid_preset.item_operation.delete: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.grid_preset", "DELETE" ] resource.grid_preset.item_operation.markAsDefault: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -365,23 +238,8 @@ services: - "partkeepr.grid_preset.mark_as_default" # Controller - "MarkGridPresetAsDefault" # Route name - resource.grid_preset: - parent: "api.resource" - arguments: [ "PartKeepr\FrontendBundle\Entity\GridPreset" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.grid_preset.item_operation.get", "@resource.grid_preset.item_operation.put", "@resource.grid_preset.item_operation.delete", "@resource.grid_preset.item_operation.markAsDefault" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - resource.part.collection_operation.custom_post: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -392,7 +250,7 @@ services: - "PartPost" resource.part.collection_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -403,13 +261,13 @@ services: - "PartsGet" resource.part.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.part", "GET" ] resource.part.item_operation.custom_put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -421,13 +279,13 @@ services: resource.part.item_operation.delete: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.part", "DELETE" ] resource.part.item_operation.add_stock: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -438,7 +296,7 @@ services: - "PartAddStock" # Route name resource.part.item_operation.remove_stock: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -449,7 +307,7 @@ services: - "PartRemoveStock" # Route name resource.part.item_operation.set_stock: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -459,25 +317,9 @@ services: - "partkeepr.part.set_stock" # Controller - "PartSetStock" # Route name - resource.part: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\Part" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.part.item_operation.get", "@resource.part.item_operation.custom_put", "@resource.part.item_operation.delete", "@resource.part.item_operation.add_stock", "@resource.part.item_operation.remove_stock", "@resource.part.item_operation.set_stock" ] ] - - method: "initCollectionOperations" - arguments: [ [ "@resource.part.collection_operation.custom_get", "@resource.part.collection_operation.custom_post" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default", "readonly" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default", "stock" ] } resource.part_attachment.item_operation.custom_get_image: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -492,7 +334,7 @@ services: "returns": "xmls:string" resource.part_attachment.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -507,7 +349,7 @@ services: "returns": "xmls:string" resource.part_attachment.item_operation.custom_get_mime: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -522,28 +364,14 @@ services: "returns": "xmls:string" resource.part_attachment.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.part_attachment", "GET" ] - resource.part_attachment: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\PartAttachment" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.part_attachment.item_operation.get", "@resource.part_attachment.item_operation.custom_get", "@resource.part_attachment.item_operation.custom_get_mime", "@resource.part_attachment.item_operation.custom_get_image" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.part_category.item_operation.move: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -554,7 +382,7 @@ services: - "PartKeeprPartCategoryMove" resource.part_category.collection_operation.get_root: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -565,97 +393,27 @@ services: - "PartKeeprPartCategoryGetRootNode" resource.part_category.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.part_category", "GET" ] resource.part_category.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.part_category", "PUT" ] resource.part_category.item_operation.delete: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.part_category", "DELETE" ] - resource.part_category: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\Entity\\PartCategory" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initCollectionOperations" - arguments: [ [ "@resource.part_category.collection_operation.get", "@resource.part_category.collection_operation.get_root", "@resource.part_category.collection_operation.post" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.part_category.item_operation.get", "@resource.part_category.item_operation.put", "@resource.part_category.item_operation.delete", "@resource.part_category.item_operation.move" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default", "tree" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default", "tree" ] } - - resource.part_distributor: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\PartDistributor" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.part_manufacturer: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\PartManufacturer" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.part_parameter: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\PartParameter" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.meta_part_parameter_criteria: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\MetaPartParameterCriteria" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.manufacturer: - parent: "api.resource" - arguments: [ "PartKeepr\\ManufacturerBundle\\Entity\\Manufacturer" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } + resource.manufacturer_ic_logo.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -670,34 +428,20 @@ services: "returns": "xmls:string" resource.manufacturer_ic_logo.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.manufacturer_ic_logo", "GET" ] resource.manufacturer_ic_logo.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.manufacturer_ic_logo", "PUT" ] - resource.manufacturer_ic_logo: - parent: "api.resource" - arguments: [ "PartKeepr\\ManufacturerBundle\Entity\ManufacturerICLogo" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.manufacturer_ic_logo.item_operation.get", "@resource.manufacturer_ic_logo.item_operation.put", "@resource.manufacturer_ic_logo.item_operation.custom_get" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.partmeasurementunit.item_operation.custom_put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -712,90 +456,22 @@ services: "returns": "xmls:string" resource.partmeasurementunit.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.partmeasurementunit", "GET" ] resource.partmeasurementunit.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.partmeasurementunit", "PUT" ] - resource.partmeasurementunit: - parent: "api.resource" - arguments: [ "PartKeepr\\PartBundle\\Entity\\PartMeasurementUnit" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.partmeasurementunit.item_operation.custom_put", "@resource.partmeasurementunit.item_operation.get", "@resource.partmeasurementunit.item_operation.put" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - - resource.unit: - parent: "api.resource" - arguments: [ "PartKeepr\\UnitBundle\\Entity\\Unit" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.siprefix: - parent: "api.resource" - arguments: [ "PartKeepr\\SiPrefixBundle\\Entity\\SiPrefix" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - -# ######################## Storage Location Categories###################################### - resource.storage_location: - parent: "api.resource" - arguments: [ "PartKeepr\StorageLocationBundle\Entity\StorageLocation" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.stock_entry: - parent: "api.resource" - arguments: [ "PartKeepr\StockBundle\Entity\StockEntry" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } # ######################## Storage Location Categories###################################### resource.storage_location_category.item_operation.move: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -806,7 +482,7 @@ services: - "StorageLocationCategoryMove" # Route name resource.storage_location_category.collection_operation.get_root: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -817,52 +493,38 @@ services: - "StorageLocationCategoryGetRoot" # Route name resource.storage_location_category.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.storage_location_category", "GET" ] resource.storage_location_category.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.storage_location_category", "PUT" ] resource.storage_location_category.item_operation.delete: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.storage_location_category", "DELETE" ] resource.storage_location_category.collection_operation.post: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: [ "@resource.storage_location_category", "POST" ] - resource.storage_location_category: - parent: "api.resource" - arguments: [ "PartKeepr\StorageLocationBundle\Entity\StorageLocationCategory" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initCollectionOperations" - arguments: [ [ "@resource.storage_location_category.collection_operation.get", "@resource.storage_location_category.collection_operation.get_root", "@resource.storage_location_category.collection_operation.post" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.storage_location_category.item_operation.get", "@resource.storage_location_category.item_operation.put", "@resource.storage_location_category.item_operation.delete", "@resource.storage_location_category.item_operation.move" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default", "tree" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default", "tree" ] } resource.storage_location_image.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.storage_location_image", "GET" ] resource.storage_location_image.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -876,30 +538,16 @@ services: "hydra:title": "A custom operation" "returns": "xmls:string" - resource.storage_location_image: - parent: "api.resource" - arguments: [ "PartKeepr\StorageLocationBundle\Entity\StorageLocationImage" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.storage_location_image.item_operation.get", "@resource.storage_location_image.item_operation.custom_get" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } # ######################## Temporary Images ###################################### resource.tempimage.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.tempimage", "GET" ] resource.tempimage.collection_operation.custom_post: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -914,7 +562,7 @@ services: "returns": "xmls:string" resource.tempimage.collection_operation.custom_post_webcam: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -929,7 +577,7 @@ services: "returns": "xmls:string" resource.tempimage.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -943,18 +591,9 @@ services: "hydra:title": "A custom operation" "returns": "xmls:string" - resource.tempimage: - parent: "api.resource" - arguments: [ "PartKeepr\\ImageBundle\\Entity\\TempImage" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initCollectionOperations" - arguments: [ [ "@resource.tempimage.collection_operation.custom_post", "@resource.tempimage.collection_operation.custom_post_webcam" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.tempimage.item_operation.get", "@resource.tempimage.item_operation.custom_get" ] ] resource.tempfile.collection_operation.custom_post: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -969,7 +608,7 @@ services: "returns": "xmls:string" resource.tempfile.collection_operation.custom_post_webcam: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -984,13 +623,13 @@ services: "returns": "xmls:string" resource.tempfile.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.tempfile", "GET" ] resource.tempfile.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1005,7 +644,7 @@ services: "returns": "xmls:string" resource.tempfile.item_operation.custom_get_mimetype: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1019,24 +658,15 @@ services: "hydra:title": "A custom operation" "returns": "xmls:string" - resource.tempfile: - parent: "api.resource" - arguments: [ "PartKeepr\\UploadedFileBundle\\Entity\\TempUploadedFile" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initCollectionOperations" - arguments: [ [ "@resource.tempfile.collection_operation.custom_post" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.tempfile.item_operation.get", "@resource.tempfile.item_operation.custom_get", "@resource.tempfile.item_operation.custom_get_mimetype", "@resource.tempfile.collection_operation.custom_post_webcam" ] ] resource.tip_of_the_day.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.tip_of_the_day", "GET" ] resource.tip_of_the_day.item_operation.mark_read: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1048,19 +678,19 @@ services: resource.tip_of_the_day.collection_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: [ "@resource.tip_of_the_day", "GET" ] resource.tip_of_the_day.collection_operation.post: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: [ "@resource.tip_of_the_day", "POST" ] resource.tip_of_the_day.collection_operation.mark_all_unread: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1070,25 +700,9 @@ services: - "partkeepr.tip_of_the_day.mark_all_unread" - "TipMarkAllUnrad" - resource.tip_of_the_day: - parent: "api.resource" - arguments: [ "PartKeepr\\TipOfTheDayBundle\\Entity\\TipOfTheDay" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initCollectionOperations" - arguments: [ [ "@resource.tip_of_the_day.collection_operation.get", "@resource.tip_of_the_day.collection_operation.post", "@resource.tip_of_the_day.collection_operation.mark_all_unread" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.tip_of_the_day.item_operation.get", "@resource.tip_of_the_day.item_operation.mark_read" ] ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.tip_of_the_day_history.collection_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1098,23 +712,8 @@ services: - "partkeepr.tip_of_the_day_history.collection_get" - "TipHistoriesGet" - resource.tip_of_the_day_history: - parent: "api.resource" - arguments: [ "PartKeepr\\TipOfTheDayBundle\\Entity\\TipOfTheDayHistory" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initCollectionOperations" - arguments: [ [ "@resource.tip_of_the_day_history.collection_operation.custom_get" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - resource.user.item_operation.get_preferences: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1125,7 +724,7 @@ services: - "PartKeeprUserPreferenceGet" resource.user.item_operation.set_preference: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1136,7 +735,7 @@ services: - "PartKeeprUserPreferenceSet" resource.user.item_operation.delete_preference: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1147,7 +746,7 @@ services: - "PartKeeprUserPreferenceDelete" resource.user.item_operation.login: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1158,7 +757,7 @@ services: - "PartKeeprAuthLogin" resource.user.item_operation.change_password: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1169,7 +768,7 @@ services: - "PartKeeprAuthChangePassword" resource.user.collection_operation.get_providers: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1180,13 +779,13 @@ services: - "PartKeeprAuthGetProviders" resource.user.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.user", "GET" ] resource.user.item_operation.put_custom: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1197,7 +796,7 @@ services: - "PartKeeprUserPut" resource.user.collection_operation.post_custom: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1208,7 +807,7 @@ services: - "PartKeeprUserPost" resource.user.item_operation.delete_custom: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1218,83 +817,15 @@ services: - "partkeepr.user.delete" # Controller - "PartKeeprUserDelete" - resource.user_provider: - parent: "api.resource" - arguments: [ "PartKeepr\\AuthBundle\\Entity\\UserProvider" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.user: - parent: "api.resource" - arguments: [ "PartKeepr\\AuthBundle\\Entity\\User" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initCollectionOperations" - arguments: [ [ "@resource.user.collection_operation.get", "@resource.user.collection_operation.post_custom", "@resource.user.collection_operation.get_providers" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.user.item_operation.get", "@resource.user.item_operation.get", "@resource.user.item_operation.put_custom", "@resource.user.item_operation.delete_custom", "@resource.user.item_operation.get_preferences", "@resource.user.item_operation.set_preference", "@resource.user.item_operation.delete_preference", "@resource.user.item_operation.login", "@resource.user.item_operation.change_password" ] ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.fos_user: - parent: "api.resource" - arguments: [ "PartKeepr\\AuthBundle\\Entity\\FOSUser" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.project: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\Project" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.project_part: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\ProjectPart" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.project_report.collection_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: [ "@resource.project_report", "GET" ] resource.project_report.item_operation.custom_post: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1309,7 +840,7 @@ services: "returns": "xmls:string" resource.project_report.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1324,62 +855,20 @@ services: "returns": "xmls:string" resource.project_report.item_operation.put: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.project_report", "PUT" ] resource.project_report.item_operation.delete: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.project_report", "DELETE" ] - resource.project_report: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\Report" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.project_report.item_operation.custom_get", "@resource.project_report.item_operation.put", "@resource.project_report.item_operation.delete" ] ] - - method: "initCollectionOperations" - arguments: [ [ "@resource.project_report.collection_operation.get", "@resource.project_report.item_operation.custom_post"]] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default", "readonly" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.project_report_project: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\ReportProject" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.project_report_part: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\ReportPart" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.project_attachment.item_operation.custom_get_image: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1394,7 +883,7 @@ services: "returns": "xmls:string" resource.project_attachment.item_operation.custom_get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1409,7 +898,7 @@ services: "returns": "xmls:string" resource.project_attachment.item_operation.custom_get_mime: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1424,60 +913,21 @@ services: "returns": "xmls:string" resource.project_attachment.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.project_attachment", "GET" ] - resource.project_attachment: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\ProjectAttachment" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.project_attachment.item_operation.get", "@resource.project_attachment.item_operation.custom_get", "@resource.project_attachment.item_operation.custom_get_mime", "@resource.project_attachment.item_operation.custom_get_image" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.project_run: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\ProjectRun" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } - - resource.project_run_part: - parent: "api.resource" - arguments: [ "PartKeepr\\ProjectBundle\\Entity\\ProjectRunPart" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } + resource.system_notice.item_operation.get: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: [ "@resource.system_notice", "GET" ] resource.system_notice.item_operation.acknowledge: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1487,23 +937,9 @@ services: - "partkeepr.system_notice.acknowledge" # Controller - "SystemNoticeAcknowledge" # Route name - resource.system_notice: - parent: "api.resource" - arguments: [ "PartKeepr\\CoreBundle\\Entity\\SystemNotice" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initItemOperations" - arguments: [ [ "@resource.system_notice.item_operation.get", "@resource.system_notice.item_operation.acknowledge" ] ] - - method: "initFilters" - arguments: [ [ "@doctrine_reflection_service.search_filter" ] ] - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } resource.system_preference.item_operation.get_preferences: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1514,7 +950,7 @@ services: - "PartKeeprSystemPreferenceGet" resource.system_preference.item_operation.set_preference: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: @@ -1525,7 +961,7 @@ services: - "PartKeeprSystemPreferenceSet" resource.system_preference.item_operation.delete_preference: - class: "Dunglas\ApiBundle\Api\Operation\Operation" + class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: @@ -1535,17 +971,3 @@ services: - "partkeepr.system_preference.delete_preference" # Controller - "PartKeeprSystemPreferenceDelete" - resource.system_preference: - parent: "api.resource" - arguments: [ "PartKeepr\\SystemPreferenceBundle\\Entity\\SystemPreference" ] - tags: [ { name: "api.resource" } ] - calls: - - method: "initNormalizationContext" - arguments: [ { groups: [ "default" ] } ] - - method: "initCollectionOperations" - arguments: [ [ "@resource.system_preference.item_operation.get_preferences" ] ] - - method: "initItemOperations" - arguments: [ [ "@resource.system_preference.item_operation.set_preference", "@resource.system_preference.item_operation.delete_preference" ] ] - - method: "initDenormalizationContext" - arguments: - - { groups: [ "default" ] } diff --git a/src/PartKeepr/AuthBundle/Entity/FOSUser.php b/src/PartKeepr/AuthBundle/Entity/FOSUser.php index 6d92bd0fb..0b89ad7cb 100644 --- a/src/PartKeepr/AuthBundle/Entity/FOSUser.php +++ b/src/PartKeepr/AuthBundle/Entity/FOSUser.php @@ -2,12 +2,21 @@ namespace PartKeepr\AuthBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use FOS\UserBundle\Model\User as BaseUser; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @ORM\Table(name="FOSUser") * @ORM\AttributeOverrides({ diff --git a/src/PartKeepr/AuthBundle/Entity/User.php b/src/PartKeepr/AuthBundle/Entity/User.php index b39a7669a..9b23b90d3 100644 --- a/src/PartKeepr/AuthBundle/Entity/User.php +++ b/src/PartKeepr/AuthBundle/Entity/User.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\DoctrineReflectionBundle\Annotation\VirtualField; @@ -12,6 +14,31 @@ use Symfony\Component\Validator\Constraints as Assert; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * collectionOperations={ + * "get"={"method"="@resource.user.collection_operation.get"}, + * "get_providers"={"method"="@resource.user.collection_operation.get_providers"}, + * "post_custom"={"method"="@resource.user.collection_operation.post_custom"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.user.item_operation.get"}, + * "put_custom"={"method"="@resource.user.item_operation.put_custom"}, + * "delete_custom"={"method"="@resource.user.item_operation.delete_custom"}, + * "get_preferences"={"method"="@resource.user.item_operation.get_preferences"}, + * "set_preference"={"method"="@resource.user.item_operation.set_preference"}, + * "delete_preference"={"method"="@resource.user.item_operation.delete_preference"}, + * "login"={"method"="@resource.user.item_operation.login"}, + * "change_password"={"method"="@resource.user.item_operation.change_password"} + * } + * ) * @ORM\Entity * @ORM\Table( * name="PartKeeprUser", diff --git a/src/PartKeepr/AuthBundle/Entity/UserPreference.php b/src/PartKeepr/AuthBundle/Entity/UserPreference.php index 7e3a68172..2c684d697 100644 --- a/src/PartKeepr/AuthBundle/Entity/UserPreference.php +++ b/src/PartKeepr/AuthBundle/Entity/UserPreference.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\DoctrineReflectionBundle\Annotation\IgnoreIds; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -15,6 +17,7 @@ * * Note that values are stored internally as serialized PHP values to keep their type. * + * @ApiResource * @ORM\Entity * @TargetService(uri="/api/user_preferences") * @IgnoreIds() diff --git a/src/PartKeepr/AuthBundle/Entity/UserProvider.php b/src/PartKeepr/AuthBundle/Entity/UserProvider.php index f1b482c5b..3d463f851 100644 --- a/src/PartKeepr/AuthBundle/Entity/UserProvider.php +++ b/src/PartKeepr/AuthBundle/Entity/UserProvider.php @@ -2,12 +2,21 @@ namespace PartKeepr\AuthBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @ORM\Table( * name="UserProvider", diff --git a/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php b/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php index 16039d24e..227e23332 100644 --- a/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php +++ b/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php @@ -3,12 +3,30 @@ namespace PartKeepr\BatchJobBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.batchjob.item_operation.get"}, + * "put"={"method"="@resource.batchjob.item_operation.put"}, + * "delete"={"method"="@resource.batchjob.item_operation.delete"}, + * "execute"={"method"="@resource.batchjob.item_operation.execute"} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/batch_jobs") */ diff --git a/src/PartKeepr/BatchJobBundle/Entity/BatchJobQueryField.php b/src/PartKeepr/BatchJobBundle/Entity/BatchJobQueryField.php index 53b320616..b379a8a02 100644 --- a/src/PartKeepr/BatchJobBundle/Entity/BatchJobQueryField.php +++ b/src/PartKeepr/BatchJobBundle/Entity/BatchJobQueryField.php @@ -2,13 +2,22 @@ namespace PartKeepr\BatchJobBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use Symfony\Component\Serializer\Annotation\Groups; /** * Represents a batch job query field. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity */ class BatchJobQueryField extends BaseEntity diff --git a/src/PartKeepr/BatchJobBundle/Entity/BatchJobUpdateField.php b/src/PartKeepr/BatchJobBundle/Entity/BatchJobUpdateField.php index 03c2d3ed3..bca1d06c4 100644 --- a/src/PartKeepr/BatchJobBundle/Entity/BatchJobUpdateField.php +++ b/src/PartKeepr/BatchJobBundle/Entity/BatchJobUpdateField.php @@ -2,13 +2,22 @@ namespace PartKeepr\BatchJobBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use Symfony\Component\Serializer\Annotation\Groups; /** * Represents a batch job update field. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity */ class BatchJobUpdateField extends BaseEntity diff --git a/src/PartKeepr/CategoryBundle/Entity/AbstractCategory.php b/src/PartKeepr/CategoryBundle/Entity/AbstractCategory.php index 5dd840d53..4e0e492af 100644 --- a/src/PartKeepr/CategoryBundle/Entity/AbstractCategory.php +++ b/src/PartKeepr/CategoryBundle/Entity/AbstractCategory.php @@ -3,7 +3,9 @@ namespace PartKeepr\CategoryBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use Gedmo\Mapping\Annotation as Gedmo; use PartKeepr\CoreBundle\Entity\BaseEntity; use Symfony\Component\Serializer\Annotation\Groups; diff --git a/src/PartKeepr/CoreBundle/Entity/BaseEntity.php b/src/PartKeepr/CoreBundle/Entity/BaseEntity.php index 33779d703..820c7ced1 100644 --- a/src/PartKeepr/CoreBundle/Entity/BaseEntity.php +++ b/src/PartKeepr/CoreBundle/Entity/BaseEntity.php @@ -2,7 +2,9 @@ namespace PartKeepr\CoreBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** @ORM\MappedSuperclass */ abstract class BaseEntity diff --git a/src/PartKeepr/CoreBundle/Entity/SystemNotice.php b/src/PartKeepr/CoreBundle/Entity/SystemNotice.php index 2899afe70..60d548292 100644 --- a/src/PartKeepr/CoreBundle/Entity/SystemNotice.php +++ b/src/PartKeepr/CoreBundle/Entity/SystemNotice.php @@ -2,13 +2,29 @@ namespace PartKeepr\CoreBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; /** * Holds a system notice. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.system_notice.item_operation.get"}, + * "acknowledge"={"method"="@resource.system_notice.item_operation.acknowledge"} + * } + * ) * @ORM\Entity * @TargetService("/api/system_notices") **/ diff --git a/src/PartKeepr/CronLoggerBundle/Entity/CronLogger.php b/src/PartKeepr/CronLoggerBundle/Entity/CronLogger.php index b5f822f53..7175dcf2d 100644 --- a/src/PartKeepr/CronLoggerBundle/Entity/CronLogger.php +++ b/src/PartKeepr/CronLoggerBundle/Entity/CronLogger.php @@ -2,12 +2,15 @@ namespace PartKeepr\CronLoggerBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; /** * Holds a project attachment. * + * @ApiResource * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="cronjob", columns={"cronjob"})}) * @ORM\Entity **/ diff --git a/src/PartKeepr/DistributorBundle/Entity/Distributor.php b/src/PartKeepr/DistributorBundle/Entity/Distributor.php index 3072a6f87..11e52ebe4 100644 --- a/src/PartKeepr/DistributorBundle/Entity/Distributor.php +++ b/src/PartKeepr/DistributorBundle/Entity/Distributor.php @@ -2,14 +2,23 @@ namespace PartKeepr\DistributorBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; /** * Represents a distributor. - * + * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/distributors") **/ diff --git a/src/PartKeepr/FootprintBundle/Entity/Footprint.php b/src/PartKeepr/FootprintBundle/Entity/Footprint.php index 5fa4b719b..d749b8557 100644 --- a/src/PartKeepr/FootprintBundle/Entity/Footprint.php +++ b/src/PartKeepr/FootprintBundle/Entity/Footprint.php @@ -3,7 +3,9 @@ namespace PartKeepr\FootprintBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Annotation\UploadedFile; @@ -11,6 +13,13 @@ use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/footprints") */ diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php index 00cf4a6a2..38989d6c5 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php @@ -2,12 +2,29 @@ namespace PartKeepr\FootprintBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; /** * Holds a footprint attachment. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.footprint_attachment.item_operation.get"}, + * "custom_get"={"method"="@resource.footprint_attachment.item_operation.custom_get"}, + * "custom_get_mime"={"method"="@resource.footprint_attachment.item_operation.custom_get_mime"} + * } + * ) * @ORM\Entity **/ class FootprintAttachment extends UploadedFile diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php index 36e7211df..083377e5a 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php @@ -3,7 +3,9 @@ namespace PartKeepr\FootprintBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use Gedmo\Mapping\Annotation as Gedmo; use PartKeepr\CategoryBundle\Entity\AbstractCategory; use PartKeepr\CategoryBundle\Entity\CategoryPathInterface; @@ -11,6 +13,26 @@ use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default", "tree"}}, + * "denormalization_context"={"groups"={"default", "tree"}} + * }, + * collectionOperations={ + * "get"={"method"="@resource.footprint_category.collection_operation.get"}, + * "get_root"={"method"="@resource.footprint_category.collection_operation.get_root"}, + * "post"={"method"="@resource.footprint_category.collection_operation.post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.footprint_category.item_operation.get"}, + * "put"={"method"="@resource.footprint_category.item_operation.put"}, + * "delete"={"method"="@resource.footprint_category.item_operation.delete"}, + * "move"={"method"="@resource.footprint_category.item_operation.move"} + * } + * ) * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\NestedTreeRepository") * @Gedmo\Tree(type="nested") * @ORM\Table(indexes={@ORM\Index(columns={"lft"}),@ORM\Index(columns={"rgt"})}) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php index c43fefcaa..e2b1aae7a 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php @@ -2,12 +2,28 @@ namespace PartKeepr\FootprintBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; /** * Holds a footprint image. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.footprint_image.item_operation.get"}, + * "custom_get"={"method"="@resource.footprint_image.item_operation.custom_get"} + * } + * ) * @ORM\Entity **/ class FootprintImage extends Image diff --git a/src/PartKeepr/FrontendBundle/Entity/GridPreset.php b/src/PartKeepr/FrontendBundle/Entity/GridPreset.php index d1ea1dd3b..a6396e532 100644 --- a/src/PartKeepr/FrontendBundle/Entity/GridPreset.php +++ b/src/PartKeepr/FrontendBundle/Entity/GridPreset.php @@ -2,7 +2,9 @@ namespace PartKeepr\FrontendBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -10,6 +12,22 @@ /** * Stores the grid presets. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.grid_preset.item_operation.get"}, + * "put"={"method"="@resource.grid_preset.item_operation.put"}, + * "delete"={"method"="@resource.grid_preset.item_operation.delete"}, + * "markAsDefault"={"method"="@resource.grid_preset.item_operation.markAsDefault"} + * } + * ) * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="name_grid_unique", columns={"grid", "name"})}) * @ORM\Entity() * @TargetService(uri="/api/grid_presets") diff --git a/src/PartKeepr/ImageBundle/Entity/CachedImage.php b/src/PartKeepr/ImageBundle/Entity/CachedImage.php index 3106a9307..e74d5752a 100644 --- a/src/PartKeepr/ImageBundle/Entity/CachedImage.php +++ b/src/PartKeepr/ImageBundle/Entity/CachedImage.php @@ -2,7 +2,9 @@ namespace PartKeepr\ImageBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; @@ -11,6 +13,7 @@ * operations, so that the resize/scale operation doesn't need to be done * every time a scaled/resized image is requested. * + * @ApiResource * @ORM\Entity */ class CachedImage extends BaseEntity diff --git a/src/PartKeepr/ImageBundle/Entity/Image.php b/src/PartKeepr/ImageBundle/Entity/Image.php index 45e9447fe..fd58bb3a3 100644 --- a/src/PartKeepr/ImageBundle/Entity/Image.php +++ b/src/PartKeepr/ImageBundle/Entity/Image.php @@ -2,7 +2,9 @@ namespace PartKeepr\ImageBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\Image\Exceptions\InvalidImageTypeException; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; diff --git a/src/PartKeepr/ImageBundle/Entity/TempImage.php b/src/PartKeepr/ImageBundle/Entity/TempImage.php index dd052456b..5eac5fb70 100644 --- a/src/PartKeepr/ImageBundle/Entity/TempImage.php +++ b/src/PartKeepr/ImageBundle/Entity/TempImage.php @@ -2,12 +2,27 @@ namespace PartKeepr\ImageBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** * Represents a temporary image. Temporary images are used when * a user uploaded an image, but not attached it to an entity. * + * @ApiResource( + * collectionOperations={ + * "custom_post_webcam"={"method"="@resource.tempimage.collection_operation.custom_post_webcam"}, + * "post"={"method"="@resource.tempimage.collection_operation.custom_post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.tempimage.item_operation.get"}, + * "custom_get"={"method"="@resource.tempimage.item_operation.custom_get"} + * } + * ) * @ORM\Entity */ class TempImage extends Image diff --git a/src/PartKeepr/ImportBundle/Entity/ImportPreset.php b/src/PartKeepr/ImportBundle/Entity/ImportPreset.php index 95696d509..ee70e487b 100644 --- a/src/PartKeepr/ImportBundle/Entity/ImportPreset.php +++ b/src/PartKeepr/ImportBundle/Entity/ImportPreset.php @@ -2,12 +2,21 @@ namespace PartKeepr\ImportBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="name_entity_unique", columns={"baseEntity", "name"})}) * @ORM\Entity() * @TargetService(uri="/api/import_presets") diff --git a/src/PartKeepr/ManufacturerBundle/Entity/Manufacturer.php b/src/PartKeepr/ManufacturerBundle/Entity/Manufacturer.php index bf326e239..152d1baa2 100644 --- a/src/PartKeepr/ManufacturerBundle/Entity/Manufacturer.php +++ b/src/PartKeepr/ManufacturerBundle/Entity/Manufacturer.php @@ -3,7 +3,9 @@ namespace PartKeepr\ManufacturerBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Annotation\UploadedFileCollection; @@ -12,6 +14,13 @@ /** * Represents a manufacturer. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/manufacturers") **/ diff --git a/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php b/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php index 6fc77c435..246303043 100644 --- a/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php +++ b/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php @@ -2,12 +2,29 @@ namespace PartKeepr\ManufacturerBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; /** * Holds a manufacturer IC logo. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.manufacturer_ic_logo.item_operation.get"}, + * "put"={"method"="@resource.manufacturer_ic_logo.item_operation.put"}, + * "custom_get"={"method"="@resource.manufacturer_ic_logo.item_operation.custom_get"} + * } + * ) * @ORM\Entity **/ class ManufacturerICLogo extends Image diff --git a/src/PartKeepr/PartBundle/Entity/MetaPartParameterCriteria.php b/src/PartKeepr/PartBundle/Entity/MetaPartParameterCriteria.php index 7c4a24251..951316427 100644 --- a/src/PartKeepr/PartBundle/Entity/MetaPartParameterCriteria.php +++ b/src/PartKeepr/PartBundle/Entity/MetaPartParameterCriteria.php @@ -2,12 +2,23 @@ namespace PartKeepr\PartBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\SiPrefixBundle\Entity\SiPrefix; use Symfony\Component\Serializer\Annotation\Groups; + + + /** + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity() */ class MetaPartParameterCriteria extends BaseEntity diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index 0ebda3a22..5651ace98 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -3,7 +3,9 @@ namespace PartKeepr\PartBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\FootprintBundle\Entity\Footprint; @@ -21,6 +23,28 @@ /** * Represents a part in the database. The heart of our project. Handle with care! * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default", "readonly" }}, + * "denormalization_context"={"groups"={"default", "stock"}} + * }, + * collectionOperations={ + * "custom_get"={"method"="@resource.part.collection_operation.custom_get"}, + * "custom_post"={"method"="@resource.part.collection_operation.custom_post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.part.item_operation.get"}, + * "custom_put"={"method"="@resource.part.item_operation.custom_put"}, + * "delete"={"method"="@resource.part.item_operation.delete"}, + * "add_stock"={"method"="@resource.part.item_operation.add_stock"}, + * "remove_stock"={"method"="@resource.part.item_operation.remove_stock"}, + * "set_stock"={"method"="@resource.part.item_operation.set_stock"} + * } + * ) * @ORM\Entity * @ORM\HasLifecycleCallbacks * @TargetService(uri="/api/parts") diff --git a/src/PartKeepr/PartBundle/Entity/PartAttachment.php b/src/PartKeepr/PartBundle/Entity/PartAttachment.php index fda092167..3d6519c6e 100644 --- a/src/PartKeepr/PartBundle/Entity/PartAttachment.php +++ b/src/PartKeepr/PartBundle/Entity/PartAttachment.php @@ -2,13 +2,31 @@ namespace PartKeepr\PartBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; use Symfony\Component\Serializer\Annotation\Groups; /** * Holds a part attachment. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.part_attachment.item_operation.get"}, + * "custom_get"={"method"="@resource.part_attachment.item_operation.custom_get"}, + * "custom_get_mime"={"method"="@resource.part_attachment.item_operation.custom_get_mime"}, + * "custom_get_image"={"method"="@resource.part_attachment.item_operation.custom_get_image"} + * } + * ) * @ORM\Entity **/ class PartAttachment extends UploadedFile diff --git a/src/PartKeepr/PartBundle/Entity/PartCategory.php b/src/PartKeepr/PartBundle/Entity/PartCategory.php index 14ad674d3..552d66891 100644 --- a/src/PartKeepr/PartBundle/Entity/PartCategory.php +++ b/src/PartKeepr/PartBundle/Entity/PartCategory.php @@ -3,7 +3,9 @@ namespace PartKeepr\PartBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use Gedmo\Mapping\Annotation as Gedmo; use PartKeepr\CategoryBundle\Entity\AbstractCategory; use PartKeepr\CategoryBundle\Entity\CategoryPathInterface; @@ -11,6 +13,26 @@ use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default", "tree"}}, + * "denormalization_context"={"groups"={"default", "tree"}} + * }, + * collectionOperations={ + * "get"={"method"="@resource.part_category.collection_operation.get"}, + * "get_root"={"method"="@resource.part_category.collection_operation.get_root"}, + * "post"={"method"="@resource.part_category.collection_operation.post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.part_category.item_operation.get"}, + * "put"={"method"="@resource.part_category.item_operation.put"}, + * "delete"={"method"="@resource.part_category.item_operation.delete"}, + * "move"={"method"="@resource.part_category.item_operation.move"} + * } + * ) * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\NestedTreeRepository") * @ORM\Table(indexes={@ORM\Index(columns={"lft"}),@ORM\Index(columns={"rgt"})}) * @Gedmo\Tree(type="nested") diff --git a/src/PartKeepr/PartBundle/Entity/PartDistributor.php b/src/PartKeepr/PartBundle/Entity/PartDistributor.php index 232c3ef7a..d9f9a9ca3 100644 --- a/src/PartKeepr/PartBundle/Entity/PartDistributor.php +++ b/src/PartKeepr/PartBundle/Entity/PartDistributor.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DistributorBundle\Entity\Distributor; use PartKeepr\PartBundle\Exceptions\PackagingUnitOutOfRangeException; @@ -12,6 +14,12 @@ /** * This class represents the link between a part and a distributor. * + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity */ class PartDistributor extends BaseEntity diff --git a/src/PartKeepr/PartBundle/Entity/PartManufacturer.php b/src/PartKeepr/PartBundle/Entity/PartManufacturer.php index b02394f71..638a7e095 100644 --- a/src/PartKeepr/PartBundle/Entity/PartManufacturer.php +++ b/src/PartKeepr/PartBundle/Entity/PartManufacturer.php @@ -2,12 +2,20 @@ namespace PartKeepr\PartBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\ManufacturerBundle\Entity\Manufacturer; use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity */ class PartManufacturer extends BaseEntity diff --git a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php index 4cd0cec61..3a02a8ed0 100644 --- a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php +++ b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php @@ -3,7 +3,9 @@ namespace PartKeepr\PartBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -12,6 +14,21 @@ /** * This entity represents a part measurement unit. Typical measurement units are pieces, centimeters etc. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.partmeasurementunit.item_operation.get"}, + * "put"={"method"="@resource.partmeasurementunit.item_operation.put"}, + * "custom_put"={"method"="@resource.partmeasurementunit.item_operation.custom_put"} + * } + * ) * @ORM\Entity * @ORM\Table(name="PartUnit") * @TargetService(uri="/api/part_measurement_units") diff --git a/src/PartKeepr/PartBundle/Entity/PartParameter.php b/src/PartKeepr/PartBundle/Entity/PartParameter.php index 31ceed13d..39a5985a7 100644 --- a/src/PartKeepr/PartBundle/Entity/PartParameter.php +++ b/src/PartKeepr/PartBundle/Entity/PartParameter.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\SiPrefixBundle\Entity\SiPrefix; use PartKeepr\UnitBundle\Entity\Unit; @@ -12,6 +14,12 @@ * This object represents a parameter. Each parameter can have an unit (defined by the class "Unit") associated with * a numeric value. * + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity @ORM\HasLifecycleCallbacks */ class PartParameter extends BaseEntity diff --git a/src/PartKeepr/ProjectBundle/Entity/Project.php b/src/PartKeepr/ProjectBundle/Entity/Project.php index 291309159..3e7d6d84a 100644 --- a/src/PartKeepr/ProjectBundle/Entity/Project.php +++ b/src/PartKeepr/ProjectBundle/Entity/Project.php @@ -3,16 +3,26 @@ namespace PartKeepr\ProjectBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Annotation\UploadedFileCollection; use Symfony\Component\Serializer\Annotation\Groups; + /** * Represents a project. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService("/api/projects") */ diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php b/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php index 0c357b41e..d18f66170 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php @@ -2,13 +2,31 @@ namespace PartKeepr\ProjectBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; /** * Holds a project attachment. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.project_attachment.item_operation.get"}, + * "custom_get"={"method"="@resource.project_attachment.item_operation.custom_get"}, + * "custom_get_mime"={"method"="@resource.project_attachment.item_operation.custom_get_mime"}, + * "custom_get_image"={"method"="@resource.project_attachment.item_operation.custom_get_image"} + * } + * ) * @ORM\Entity * @TargetService("/api/project_attachments") **/ diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php b/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php index 49e8db47f..ed94551f9 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php @@ -2,7 +2,9 @@ namespace PartKeepr\ProjectBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\ByReference; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; @@ -13,6 +15,13 @@ /** * Represents a project part. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService("/api/project_parts") */ diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectRun.php b/src/PartKeepr/ProjectBundle/Entity/ProjectRun.php index c5910dae2..5efd291e7 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectRun.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectRun.php @@ -3,7 +3,9 @@ namespace PartKeepr\ProjectBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -11,6 +13,13 @@ /** * Represents a project. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService("/api/project_runs") */ diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectRunPart.php b/src/PartKeepr/ProjectBundle/Entity/ProjectRunPart.php index 0bda3f157..d5c533885 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectRunPart.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectRunPart.php @@ -2,7 +2,9 @@ namespace PartKeepr\ProjectBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\PartBundle\Entity\Part; use Symfony\Component\Serializer\Annotation\Groups; @@ -10,6 +12,13 @@ /** * Represents a project run part. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity */ class ProjectRunPart extends BaseEntity diff --git a/src/PartKeepr/ProjectBundle/Entity/Report.php b/src/PartKeepr/ProjectBundle/Entity/Report.php index a20cb7ca0..cc89cdc34 100644 --- a/src/PartKeepr/ProjectBundle/Entity/Report.php +++ b/src/PartKeepr/ProjectBundle/Entity/Report.php @@ -3,7 +3,9 @@ namespace PartKeepr\ProjectBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\PartBundle\Entity\Part; @@ -12,6 +14,25 @@ /** * Represents a project part. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default", "readonly"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * collectionOperations={ + * "get"={"method"="@resource.project_report.collection_operation.get"}, + * "custom_post"={"method"="@resource.project_report.item_operation.custom_post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "custom_get"={"method"="@resource.project_report.item_operation.custom_get"}, + * "put"={"method"="@resource.project_report.item_operation.put"}, + * "delete"={"method"="@resource.project_report.item_operation.delete"} + * } + * ) * @ORM\Entity * @TargetService("/api/reports") */ diff --git a/src/PartKeepr/ProjectBundle/Entity/ReportPart.php b/src/PartKeepr/ProjectBundle/Entity/ReportPart.php index e5d4742fa..b1497c21c 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ReportPart.php +++ b/src/PartKeepr/ProjectBundle/Entity/ReportPart.php @@ -3,7 +3,9 @@ namespace PartKeepr\ProjectBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DistributorBundle\Entity\Distributor; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; @@ -14,6 +16,13 @@ /** * Represents a project part. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService("/api/project_report_parts") */ diff --git a/src/PartKeepr/ProjectBundle/Entity/ReportProject.php b/src/PartKeepr/ProjectBundle/Entity/ReportProject.php index f62566414..b208766ce 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ReportProject.php +++ b/src/PartKeepr/ProjectBundle/Entity/ReportProject.php @@ -2,7 +2,9 @@ namespace PartKeepr\ProjectBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -11,6 +13,13 @@ /** * Represents one project and the quantity. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService("/api/project_report_projects") */ diff --git a/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php b/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php index a7e1097eb..2f7750de5 100644 --- a/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php +++ b/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php @@ -2,7 +2,9 @@ namespace PartKeepr\SiPrefixBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -13,6 +15,13 @@ * * @link http://en.wikipedia.org/wiki/Metric_prefix * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/si_prefixes") */ diff --git a/src/PartKeepr/StockBundle/Entity/StockEntry.php b/src/PartKeepr/StockBundle/Entity/StockEntry.php index aba8f4484..f182c5b2a 100644 --- a/src/PartKeepr/StockBundle/Entity/StockEntry.php +++ b/src/PartKeepr/StockBundle/Entity/StockEntry.php @@ -2,7 +2,9 @@ namespace PartKeepr\StockBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; @@ -10,6 +12,13 @@ use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @ORM\HasLifecycleCallbacks * @TargetService(uri="/api/stock_entries") diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php index b9cbed65a..800b676c8 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocation.php @@ -2,13 +2,23 @@ namespace PartKeepr\StorageLocationBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Annotation\UploadedFile; use Symfony\Component\Serializer\Annotation\Groups; -/** @ORM\Entity +/** + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) + * @ORM\Entity * @TargetService(uri="/api/storage_locations") */ class StorageLocation extends BaseEntity diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php index d36e162c7..c8476b972 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php @@ -3,7 +3,9 @@ namespace PartKeepr\StorageLocationBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use Gedmo\Mapping\Annotation as Gedmo; use PartKeepr\CategoryBundle\Entity\AbstractCategory; use PartKeepr\CategoryBundle\Entity\CategoryPathInterface; @@ -11,6 +13,26 @@ use Symfony\Component\Serializer\Annotation\Groups; /** + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default", "tree"}}, + * "denormalization_context"={"groups"={"default", "tree"}} + * }, + * collectionOperations={ + * "get"={"method"="@resource.storage_location_category.collection_operation.get"}, + * "get_root"={"method"="@resource.storage_location_category.collection_operation.get_root"}, + * "post"={"method"="@resource.storage_location_category.collection_operation.post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.storage_location_category.item_operation.get"}, + * "put"={"method"="@resource.storage_location_category.item_operation.put"}, + * "delete"={"method"="@resource.storage_location_category.item_operation.delete"}, + * "move"={"method"="@resource.storage_location_category.item_operation.move"} + * } + * ) * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\NestedTreeRepository") * @Gedmo\Tree(type="nested") * @ORM\Table(indexes={@ORM\Index(columns={"lft"}),@ORM\Index(columns={"rgt"})}) diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php index cf9954f54..5429fff74 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php @@ -2,12 +2,28 @@ namespace PartKeepr\StorageLocationBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; /** * Holds a storage location image. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.storage_location_image.item_operation.get"}, + * "custom_get"={"method"="@resource.storage_location_image.item_operation.custom_get"} + * } + * ) * @ORM\Entity **/ class StorageLocationImage extends Image diff --git a/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php b/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php index 0f5f7d39d..27e206e4d 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php +++ b/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php @@ -2,7 +2,9 @@ namespace PartKeepr\SystemPreferenceBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\DoctrineReflectionBundle\Annotation\IgnoreIds; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -15,6 +17,22 @@ * * Note that values are stored internally as serialized PHP values to keep their type. * + * @ApiResource( + * attributes={ + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * collectionOperations={ + * "get_preferences"={"method"="@resource.system_preference.item_operation.get_preferences"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "set_preference"={"method"="@resource.system_preference.item_operation.set_preference"}, + * "delete_preference"={"method"="@resource.system_preference.item_operation.delete_preference"} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/system_preferences") * @IgnoreIds() diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php index dff776d83..8df90aec0 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php @@ -2,7 +2,9 @@ namespace PartKeepr\TipOfTheDayBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; @@ -16,6 +18,25 @@ * * Note: If you wish to link against a tip of the day, do it by name and not by id! * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * collectionOperations={ + * "get"={"method"="@resource.tip_of_the_day.collection_operation.get"}, + * "mark_all_unread"={"method"="@resource.tip_of_the_day.collection_operation.mark_all_unread"}, + * "post"={"method"="@resource.tip_of_the_day.collection_operation.post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.tip_of_the_day.item_operation.get"}, + * "mark_read"={"method"="@resource.tip_of_the_day.item_operation.mark_read"} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/tip_of_the_days") **/ diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php index 0b2f65419..bba82ca42 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php @@ -2,7 +2,9 @@ namespace PartKeepr\TipOfTheDayBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; @@ -13,6 +15,16 @@ * * This entity stores each tip of the day the user has already seen. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * }, + * collectionOperations={ + * "custom_get"={"method"="@resource.tip_of_the_day_history.collection_operation.custom_get"} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/tip_of_the_day_histories") **/ diff --git a/src/PartKeepr/UnitBundle/Entity/Unit.php b/src/PartKeepr/UnitBundle/Entity/Unit.php index 613bbb954..82d606f67 100644 --- a/src/PartKeepr/UnitBundle/Entity/Unit.php +++ b/src/PartKeepr/UnitBundle/Entity/Unit.php @@ -3,7 +3,9 @@ namespace PartKeepr\UnitBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\SiPrefixBundle\Entity\SiPrefix; @@ -13,6 +15,13 @@ /** * This object represents an unit. Units can be: Volt, Hertz etc. * + * @ApiResource( + * attributes={ + * "filters": {"@doctrine_reflection_service.search_filter"}, + * "normalization_context"={"groups"={"default"}}, + * "denormalization_context"={"groups"={"default"}} + * } + * ) * @ORM\Entity * @TargetService(uri="/api/units") **/ diff --git a/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php b/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php index 73ded9a9d..743229dcd 100644 --- a/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php +++ b/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php @@ -2,12 +2,28 @@ namespace PartKeepr\UploadedFileBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** * Represents a temporary file. Temporary files are used when * a user uploaded a file, but not attached it to an entity. * + * @ApiResource( + * collectionOperations={ + * "post"={"method"="@resource.tempfile.collection_operation.custom_post"} + * }, + * itemOperations={ + * "swagger"= { + * "method"="GET", + * }, + * "get"={"method"="@resource.tempfile.item_operation.get"}, + * "custom_get"={"method"="@resource.tempfile.item_operation.custom_get"}, + * "custom_get_mimetype"={"method"="@resource.tempfile.item_operation.custom_get_mimetype"}, + * "custom_post_webcam"={"method"="@resource.tempfile.collection_operation.custom_post_webcam"} + * } + * ) * @ORM\Entity */ class TempUploadedFile extends UploadedFile diff --git a/src/PartKeepr/UploadedFileBundle/Entity/UploadedFile.php b/src/PartKeepr/UploadedFileBundle/Entity/UploadedFile.php index 8bf0d4472..0aac172f1 100644 --- a/src/PartKeepr/UploadedFileBundle/Entity/UploadedFile.php +++ b/src/PartKeepr/UploadedFileBundle/Entity/UploadedFile.php @@ -2,7 +2,9 @@ namespace PartKeepr\UploadedFileBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\CoreBundle\Entity\BaseEntity; use Ramsey\Uuid\Uuid; use Symfony\Component\Serializer\Annotation\Groups; From 1dc73cc4c8ae2f28f62b24f9aae9140b7bdc99cc Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 18:28:43 +0200 Subject: [PATCH 026/140] phase 2 api_platform differences --- app/AppKernel.php | 6 ++++-- app/SymfonyRequirements.php | 33 ++++++++++++++++++++++----------- app/config/config.yml | 20 ++++++++++++++------ app/config/config_dunglas.yml | 13 ++++++++++--- app/config/config_setup.yml | 2 +- app/config/config_test.yml | 2 +- app/config/routing.yml | 2 +- app/config/routing_dev.yml | 7 ++++--- app/console | 1 + 9 files changed, 58 insertions(+), 28 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 7ec7426be..006e16cb0 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -24,7 +24,7 @@ public function registerBundles() new PartKeepr\RESTBundle\PartKeeprRESTBundle(), new Escape\WSSEAuthenticationBundle\EscapeWSSEAuthenticationBundle(), new SpriteGenerator\SpriteGeneratorBundle(), - new Dunglas\ApiBundle\DunglasApiBundle(), + new ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle(), new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(), new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(), @@ -115,8 +115,10 @@ public function getCacheDir() } return $this->rootDir.'/cache/'.$environment; +// return dirname(__DIR__).'/var/cache/'.$this->getEnvironment(); } - + + /** * Override to avoid stripping comments. * diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index b6a8564cd..4a1fcc621 100755 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -439,11 +439,13 @@ public function __construct() 'Change the permissions of either "app/logs/" or "var/logs/" directory so that the web server can write into it.' ); - $this->addPhpIniRequirement( - 'date.timezone', true, false, - 'date.timezone setting must be set', - 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).' - ); + if (version_compare($installedPhpVersion, '7.0.0', '<')) { + $this->addPhpIniRequirement( + 'date.timezone', true, false, + 'date.timezone setting must be set', + 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).' + ); + } if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) { $this->addRequirement( @@ -624,12 +626,6 @@ function_exists('mb_strlen'), 'Install and enable the mbstring extension.' ); - $this->addRecommendation( - function_exists('iconv'), - 'iconv() should be available', - 'Install and enable the iconv extension.' - ); - $this->addRecommendation( function_exists('utf8_decode'), 'utf8_decode() should be available', @@ -684,6 +680,21 @@ function_exists('posix_isatty'), 'Upgrade your intl extension with a newer ICU version (4+).' ); + if (class_exists('Symfony\Component\Intl\Intl')) { + $this->addRecommendation( + \Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion(), + sprintf('intl ICU version installed on your system is outdated (%s) and does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()), + 'To get the latest internationalization data upgrade the ICU system package and the intl PHP extension.' + ); + if (\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion()) { + $this->addRecommendation( + \Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(), + sprintf('intl ICU version installed on your system (%s) does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()), + 'To avoid internationalization data inconsistencies upgrade the symfony/intl component.' + ); + } + } + $this->addPhpIniRecommendation( 'intl.error_level', create_function('$cfgValue', 'return (int) $cfgValue === 0;'), diff --git a/app/config/config.yml b/app/config/config.yml index 7ec1536e9..1ef32805e 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -10,12 +10,22 @@ imports: - { resource: config_partkeepr.yml } - { resource: config_filesystem.yml } +framework: + serializer: true +# enable serialier for fos_rest +# serializer: +# enabled: true + fos_rest: body_listener: true format_listener: true param_fetcher_listener: force - service: - exception_handler: "partkeepr.exceptionwrapper" +# service: +# exception_handler: "partkeepr.exceptionwrapper" +# fos_rest.service.serializer +# serializer: +# serialize_null: true +# scope: request format_listener: rules: - priorities: [json, xml] @@ -29,10 +39,8 @@ fos_rest: html: false view_response_listener: true - - sensio_framework_extra: - view: { annotations: false } + view: { annotations: true } router: { annotations: true } # Assetic Configuration @@ -51,7 +59,7 @@ assetic: twig: exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction' -dunglas_api: +api_platform: title: "PartKeepr" description: "The PartKeepr REST API" collection: diff --git a/app/config/config_dunglas.yml b/app/config/config_dunglas.yml index 81c88b3fd..cc9e5d69b 100644 --- a/app/config/config_dunglas.yml +++ b/app/config/config_dunglas.yml @@ -1,4 +1,4 @@ -dunglas_api: +api_platform: title: "PartKeepr" description: "The PartKeepr REST API" collection: @@ -8,5 +8,12 @@ dunglas_api: client_enabled: true client_items_per_page: true # items_per_page: 3 - supported_formats: [ "jsonld", "csv", "xlsx" ] - cache: %cache.dunglas% + formats: + jsonld: ['application/ld+json'] + xml: ['application/xml', 'text/xml'] +# csv: ['text/csv'] + csv: ['text/comma-separated-values'] + xlsx: ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'] +# supported_formats: [ "jsonld", "csv", "xlsx" ] +# cache: %cache.dunglas% +#in v1 cache: false # The caching service to use. Set to "dunglas_api.mapping.cache.apc" to enable APC metadata caching. diff --git a/app/config/config_setup.yml b/app/config/config_setup.yml index 06a73b589..073e0c84c 100644 --- a/app/config/config_setup.yml +++ b/app/config/config_setup.yml @@ -6,7 +6,7 @@ framework: engines: ['twig', 'php'] sensio_framework_extra: - view: { annotations: false } + view: { annotations: true } router: { annotations: true } monolog: diff --git a/app/config/config_test.yml b/app/config/config_test.yml index aad23b3f9..5dd8cadf1 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -12,7 +12,7 @@ web_profiler: toolbar: false intercept_redirects: false -dunglas_api: +api_platform: cache: false doctrine: diff --git a/app/config/routing.yml b/app/config/routing.yml index e928500e7..4bac60a5b 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -57,5 +57,5 @@ _setup: api: resource: "." - type: "api" + type: "api_platform" prefix: "/api" # Optional diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 577c3c482..304e72bae 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -6,9 +6,10 @@ _profiler: resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" prefix: /_profiler -_configurator: - resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" - prefix: /_configurator +# removed due to SensioUpgrade +#_configurator: +# resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" +# prefix: /_configurator _main: resource: routing.yml diff --git a/app/console b/app/console index fa6a36e24..28fff53ca 100755 --- a/app/console +++ b/app/console @@ -8,6 +8,7 @@ set_time_limit(0); require_once __DIR__.'/bootstrap.php.cache'; +require_once __DIR__.'/autoload.php'; require_once __DIR__.'/AppKernel.php'; use Symfony\Bundle\FrameworkBundle\Console\Application; From 90dcb0730527c913973908f1d706c78b28c891dd Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 18:29:39 +0200 Subject: [PATCH 027/140] fos_rest, scope, gives error, deprecated ? --- src/PartKeepr/RESTBundle/Resources/config/request.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PartKeepr/RESTBundle/Resources/config/request.xml b/src/PartKeepr/RESTBundle/Resources/config/request.xml index 4c7997bc6..9c652dbf8 100644 --- a/src/PartKeepr/RESTBundle/Resources/config/request.xml +++ b/src/PartKeepr/RESTBundle/Resources/config/request.xml @@ -13,7 +13,7 @@ - + From 6e5ca1e2beee2cd140fc35b36b36407eedb008e5 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 18:30:39 +0200 Subject: [PATCH 028/140] negotiator class changed - to be checked --- .../DependencyInjection/Compiler/CsvFormatPass.php | 9 ++++++++- .../Compiler/XmlExcelFormatPass.php | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php index be80b49c8..01e8295aa 100644 --- a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php +++ b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php @@ -7,9 +7,16 @@ class CsvFormatPass implements CompilerPassInterface { +/* + before + + + now + +*/ public function process(ContainerBuilder $container) { - $container->getDefinition('api.format_negotiator')->addMethodCall('registerFormat', [ + $container->getDefinition('api_platform.negotiator')->addMethodCall('registerFormat', [ 'csv', ['text/comma-separated-values'], true, ]); } diff --git a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php index 7ab9ef1cf..52ef98b8f 100644 --- a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php +++ b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php @@ -7,9 +7,17 @@ class XmlExcelFormatPass implements CompilerPassInterface { + /* + before + + + now + + */ + public function process(ContainerBuilder $container) { - $container->getDefinition('api.format_negotiator')->addMethodCall('registerFormat', [ + $container->getDefinition('api_platform.negotiator')->addMethodCall('registerFormat', [ 'xlsx', ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'], true, ]); } From be80c84364927291eb3cc4ef45a2be9ea2f779b9 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 18:32:45 +0200 Subject: [PATCH 029/140] no idea when/how I changed this - check.php --- app/check.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/check.php b/app/check.php index c6e5a877e..2cf2dcec2 100755 --- a/app/check.php +++ b/app/check.php @@ -119,10 +119,14 @@ function echo_block($style, $title, $message) echo PHP_EOL.PHP_EOL; - echo_style($style, str_repeat(' ', $width).PHP_EOL); - echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); - echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); - echo_style($style, str_repeat(' ', $width).PHP_EOL); + echo_style($style, str_repeat(' ', $width)); + echo PHP_EOL; + echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT)); + echo PHP_EOL; + echo_style($style, $message); + echo PHP_EOL; + echo_style($style, str_repeat(' ', $width)); + echo PHP_EOL; } function has_color_support() From 26c884746ef8f7d52bfe573bcd1fb835ae82992d Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 11 May 2021 19:55:16 +0200 Subject: [PATCH 030/140] phase 3 - operation to annotation - BatchJob --- app/config/config_partkeepr.yml | 10 ---------- .../BatchJobBundle/Action/ExecuteBatchJobAction.php | 9 +++++++++ src/PartKeepr/BatchJobBundle/Entity/BatchJob.php | 8 ++++---- .../BatchJobBundle/Resources/config/actions.xml | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 20114d261..657b450f1 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,16 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.batchjob.item_operation.execute: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.batchjob" # Resource - - [ "PUT" ] # Methods - - "/batch_jobs/{id}/execute" # Path - - "partkeepr.batchjob.execute" # Controller - - "BatchJobExecute" # Route name resource.footprint_image.item_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" diff --git a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php index 90ac7e425..eab8f4154 100644 --- a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php +++ b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php @@ -68,6 +68,15 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo:I'm not sure about the class to declare for "_api_resource_class"=BatchJob::class or ExecuteBatchJobAction::class + /** + * @Route( + * name="BatchJobExecute", + * path="/batch_jobs/{id}/execute", + * defaults={"_api_resource_class"=BatchJob::class, "_api_item_operation_name"="execute"} + * ) + * @Method("PUT") + */ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php b/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php index 227e23332..332dac800 100644 --- a/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php +++ b/src/PartKeepr/BatchJobBundle/Entity/BatchJob.php @@ -21,10 +21,10 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.batchjob.item_operation.get"}, - * "put"={"method"="@resource.batchjob.item_operation.put"}, - * "delete"={"method"="@resource.batchjob.item_operation.delete"}, - * "execute"={"method"="@resource.batchjob.item_operation.execute"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "delete"={"method"="DELETE"}, + * "execute"={"route_name"="BatchJobExecute"} * } * ) * @ORM\Entity diff --git a/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml b/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml index 0ab212a45..ecd11c19d 100644 --- a/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml +++ b/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml @@ -3,7 +3,7 @@ - + From ab327c1c553c1d5b6cfbc8a89e08719f222d7cea Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 19:18:01 +0200 Subject: [PATCH 031/140] phase 3 - operation to annotation - FootprintImage (i guess is wrong) --- app/config/config_partkeepr.yml | 22 ------------------ .../FootprintBundle/Entity/Footprint.php | 23 +++++++++++++++++++ .../FootprintBundle/Entity/FootprintImage.php | 4 ++-- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 657b450f1..0c4150f71 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -93,28 +93,6 @@ services: tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.footprint_image.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.footprint_image", "GET" ] - - resource.footprint_image.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.footprint_image" # Resource - - [ "GET" ] # Methods - - "/footprint_images/{id}/getImage" # Path - - "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller - - "FootprintImageGetImage" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.footprint_attachment.item_operation.custom_get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/FootprintBundle/Entity/Footprint.php b/src/PartKeepr/FootprintBundle/Entity/Footprint.php index d749b8557..95cad1ce3 100644 --- a/src/PartKeepr/FootprintBundle/Entity/Footprint.php +++ b/src/PartKeepr/FootprintBundle/Entity/Footprint.php @@ -191,6 +191,29 @@ public function setImage($image) } } +/* + information to use during migration to api_platform v2 +This was in config_partkeepr.yml + resource.footprint_image.item_operation.custom_get: + - [ "GET" ] # Methods + - "/footprint_images/{id}/getImage" # Path + - "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller + - "FootprintImageGetImage" # Route name + - # Context (will be present in Hydra documentation) + "@type": "hydra:Operation" + "hydra:title": "A custom operation" + "returns": "xmls:string" + +ToDo: fix this, i don't know how wrong it is + */ + /** + * @Route( + * name="FootprintImageGetImage", + * path="/footprint_images/{id}/getImage", + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + */ /** * Returns the footprint image. * diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php index e2b1aae7a..911d89bbe 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php @@ -20,8 +20,8 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.footprint_image.item_operation.get"}, - * "custom_get"={"method"="@resource.footprint_image.item_operation.custom_get"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="FootprintImageGetImage"} * } * ) * @ORM\Entity From 6e5b3f496a451e76af85618453a1b47a4bdd5750 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 19:35:25 +0200 Subject: [PATCH 032/140] added hydra --- src/PartKeepr/FootprintBundle/Entity/FootprintImage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php index 911d89bbe..c3812cda2 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php @@ -21,7 +21,7 @@ * "method"="GET", * }, * "get"={"method"="GET"}, - * "custom_get"={"route_name"="FootprintImageGetImage"} + * "custom_get"={"route_name"="FootprintImageGetImage","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 9ea85f1447f6ccc63f30934191a5b3906ec21b23 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 19:53:34 +0200 Subject: [PATCH 033/140] revert part of the changes of FootprintImage --- .../FootprintBundle/Entity/Footprint.php | 23 ------------------- .../FootprintBundle/Entity/FootprintImage.php | 11 +++++++++ 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/Footprint.php b/src/PartKeepr/FootprintBundle/Entity/Footprint.php index 95cad1ce3..d749b8557 100644 --- a/src/PartKeepr/FootprintBundle/Entity/Footprint.php +++ b/src/PartKeepr/FootprintBundle/Entity/Footprint.php @@ -191,29 +191,6 @@ public function setImage($image) } } -/* - information to use during migration to api_platform v2 -This was in config_partkeepr.yml - resource.footprint_image.item_operation.custom_get: - - [ "GET" ] # Methods - - "/footprint_images/{id}/getImage" # Path - - "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller - - "FootprintImageGetImage" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - -ToDo: fix this, i don't know how wrong it is - */ - /** - * @Route( - * name="FootprintImageGetImage", - * path="/footprint_images/{id}/getImage", - * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} - * ) - * @Method("GET") - */ /** * Returns the footprint image. * diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php index c3812cda2..49377ccaa 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php @@ -7,6 +7,17 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller +/** + * @Route( + * name="FootprintImageGetImage", + * path="/footprint_images/{id}/getImage", + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + */ + /** * Holds a footprint image. * From 8f21599b0e7f93dfbcb5a4913229631452e7f378 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 19:55:12 +0200 Subject: [PATCH 034/140] phase 3 - operation to annotation - FootprintAttachment --- app/config/config_partkeepr.yml | 38 ------------------- .../Entity/FootprintAttachment.php | 32 ++++++++++++++-- 2 files changed, 29 insertions(+), 41 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 0c4150f71..c2469b285 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,44 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - - resource.footprint_attachment.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.footprint_attachment" # Resource - - [ "GET" ] # Methods - - "/footprint_attachments/{id}/getFile" # Path - - "PartKeeprFootprintBundle:FootprintAttachment:getFile" # Controller - - "FootprintAttachmentGet" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.footprint_attachment.item_operation.custom_get_mime: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.footprint_attachment" # Resource - - [ "GET" ] # Methods - - "/footprint_attachments/{id}/getMimeTypeIcon" # Path - - "PartKeeprFootprintBundle:FootprintAttachment:getMimeTypeIcon" # Controller - - "FootprintAttachmentMimeTypeIcon" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.footprint_attachment.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.footprint_attachment", "GET" ] - - resource.footprint_category.item_operation.move: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php index 38989d6c5..32c35c995 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php @@ -7,6 +7,32 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprFootprintBundle:FootprintAttachment:getFile" # Controller + +/** +* @Route( +* name="FootprintAttachmentGet", +* path="/footprint_attachments/{id}/getFile", +* defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +*/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprFootprintBundle:FootprintAttachment:getMimeTypeIcon" # Controller + +/** +* @Route( +* name="FootprintAttachmentMimeTypeIcon", +* path="/footprint_attachments/{id}/getMimeTypeIcon", +* defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +*/ + + /** * Holds a footprint attachment. * @@ -20,9 +46,9 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.footprint_attachment.item_operation.get"}, - * "custom_get"={"method"="@resource.footprint_attachment.item_operation.custom_get"}, - * "custom_get_mime"={"method"="@resource.footprint_attachment.item_operation.custom_get_mime"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="FootprintAttachmentGet","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_get_mime"={"route_name"="FootprintAttachmentMimeTypeIcon","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From e9252c40f1dcc79c1b4ccf39b21e47784a7c630f Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 21:00:01 +0200 Subject: [PATCH 035/140] correct to custom_get_mime --- src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php index 32c35c995..48c238e69 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php @@ -27,7 +27,7 @@ * @Route( * name="FootprintAttachmentMimeTypeIcon", * path="/footprint_attachments/{id}/getMimeTypeIcon", -* defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} +* defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get_mime"} * ) * @Method("GET") */ From e1c7d2e473dec54ed7ca9a162046f7390d7e573a Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 21:02:34 +0200 Subject: [PATCH 036/140] cosmetics --- .../FootprintBundle/Entity/FootprintAttachment.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php index 48c238e69..6ca3cb4b8 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php @@ -7,10 +7,9 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; - // ToDo: fix this - move this Route annotation to the correct place // "PartKeeprFootprintBundle:FootprintAttachment:getFile" # Controller - + /** * @Route( * name="FootprintAttachmentGet", @@ -18,11 +17,11 @@ * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} * ) * @Method("GET") -*/ +**/ // ToDo: fix this - move this Route annotation to the correct place // "PartKeeprFootprintBundle:FootprintAttachment:getMimeTypeIcon" # Controller - + /** * @Route( * name="FootprintAttachmentMimeTypeIcon", @@ -30,8 +29,7 @@ * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get_mime"} * ) * @Method("GET") -*/ - +**/ /** * Holds a footprint attachment. From da953c543b3500212782357184c43229bd11e37f Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 21:03:52 +0200 Subject: [PATCH 037/140] phase 3 - operation to annotation - FootprintCategory --- app/config/config_partkeepr.yml | 46 ------------------- .../Entity/FootprintCategory.php | 40 ++++++++++++---- 2 files changed, 32 insertions(+), 54 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index c2469b285..99ad67bf0 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,52 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.footprint_category.item_operation.move: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.footprint_category" # Resource - - [ "PUT" ] # Methods - - "/footprint_categories/{id}/move" # Path - - "partkeepr.category.move" # Controller - - "FootprintCategoryMove" # Route name - - resource.footprint_category.collection_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: [ "@resource.footprint_category", "GET" ] - - resource.footprint_category.collection_operation.get_root: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.footprint_category" # Resource - - [ "GET" ] # Methods - - "/footprint_categories/getExtJSRootNode" # Path - - "partkeepr.category.get_root_node" # Controller - - "PartKeeprFootprintCategoryGetRootNode" - - resource.footprint_category.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.footprint_category", "GET" ] - - resource.footprint_category.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.footprint_category", "PUT" ] - - resource.footprint_category.item_operation.delete: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.footprint_category", "DELETE" ] - resource.grid_preset.item_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php index 083377e5a..c6e7ec3cb 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php @@ -12,6 +12,30 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.category.get_root_node" # Controller + +/** +* @Route( +* name="PartKeeprFootprintCategoryGetRootNode", +* path="/footprint_categories/getExtJSRootNode", +* defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="get_root"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.category.move" # Controller + +/** +* @Route( +* name="FootprintCategoryMove", +* path="/footprint_categories/{id}/move", +* defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"} +* ) +* @Method("PUT") +**/ + /** * @ApiResource( * attributes={ @@ -19,18 +43,18 @@ * "denormalization_context"={"groups"={"default", "tree"}} * }, * collectionOperations={ - * "get"={"method"="@resource.footprint_category.collection_operation.get"}, - * "get_root"={"method"="@resource.footprint_category.collection_operation.get_root"}, - * "post"={"method"="@resource.footprint_category.collection_operation.post"} + * "get"={"method"="GET"}, + * "get_root"={"route_name"="PartKeeprFootprintCategoryGetRootNode"}, + * "post"={"method"="POST"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.footprint_category.item_operation.get"}, - * "put"={"method"="@resource.footprint_category.item_operation.put"}, - * "delete"={"method"="@resource.footprint_category.item_operation.delete"}, - * "move"={"method"="@resource.footprint_category.item_operation.move"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "delete"={"method"="DELETE"}, + * "move"={"route_name"="FootprintCategoryMove"} * } * ) * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\NestedTreeRepository") @@ -38,7 +62,7 @@ * @ORM\Table(indexes={@ORM\Index(columns={"lft"}),@ORM\Index(columns={"rgt"})}) * The entity for our footprint categories * @TargetService(uri="/api/footprint_categories") - */ +**/ class FootprintCategory extends AbstractCategory implements CategoryPathInterface { /** From fa2b679c7eef3ac56988d27989748015e3aced03 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 21:10:54 +0200 Subject: [PATCH 038/140] phase 3 - operation to annotation - GridPreset --- app/config/config_partkeepr.yml | 30 ------------------- .../FrontendBundle/Entity/GridPreset.php | 19 +++++++++--- 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 99ad67bf0..23487e091 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,36 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - - resource.grid_preset.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.grid_preset", "GET" ] - - resource.grid_preset.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.grid_preset", "PUT" ] - - resource.grid_preset.item_operation.delete: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.grid_preset", "DELETE" ] - - resource.grid_preset.item_operation.markAsDefault: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.grid_preset" # Resource - - [ "PUT" ] # Methods - - "/grid_presets/{id}/markAsDefault" # Path - - "partkeepr.grid_preset.mark_as_default" # Controller - - "MarkGridPresetAsDefault" # Route name - resource.part.collection_operation.custom_post: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/FrontendBundle/Entity/GridPreset.php b/src/PartKeepr/FrontendBundle/Entity/GridPreset.php index a6396e532..d8cf0fe97 100644 --- a/src/PartKeepr/FrontendBundle/Entity/GridPreset.php +++ b/src/PartKeepr/FrontendBundle/Entity/GridPreset.php @@ -9,6 +9,17 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.grid_preset.mark_as_default" # Controller +/** +* @Route( +* name="MarkGridPresetAsDefault", +* path="/grid_presets/{id}/markAsDefault", +* defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"} +* ) +* @Method("PUT") +**/ + /** * Stores the grid presets. * @@ -22,10 +33,10 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.grid_preset.item_operation.get"}, - * "put"={"method"="@resource.grid_preset.item_operation.put"}, - * "delete"={"method"="@resource.grid_preset.item_operation.delete"}, - * "markAsDefault"={"method"="@resource.grid_preset.item_operation.markAsDefault"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "delete"={"method"="DELETE"}, + * "markAsDefault"={"route_name"="MarkGridPresetAsDefault"} * } * ) * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="name_grid_unique", columns={"grid", "name"})}) From f9891d72d1f900512c2e7bdf7f035279e821b901 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 May 2021 21:32:16 +0200 Subject: [PATCH 039/140] phase 3 - operation to annotation - Part --- app/config/config_partkeepr.yml | 121 ++++------------------- src/PartKeepr/PartBundle/Entity/Part.php | 82 +++++++++++++-- 2 files changed, 94 insertions(+), 109 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 23487e091..be8aa82c0 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,86 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.part.collection_operation.custom_post: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.part" - - [ "POST" ] - - "/parts" - - "partkeepr.part.post" - - "PartPost" - - resource.part.collection_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.part" - - [ "GET" ] - - "/parts" - - "partkeepr.parts.collection_get" - - "PartsGet" - - resource.part.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.part", "GET" ] - - resource.part.item_operation.custom_put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part" - - [ "PUT" ] - - "/parts/{id}" - - "partkeepr.part.put" - - "PartPut" - - - resource.part.item_operation.delete: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.part", "DELETE" ] - - resource.part.item_operation.add_stock: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part" # Resource - - [ "PUT" ] # Methods - - "/parts/{id}/addStock" # Path - - "partkeepr.part.add_stock" # Controller - - "PartAddStock" # Route name - - resource.part.item_operation.remove_stock: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part" # Resource - - [ "PUT" ] # Methods - - "/parts/{id}/removeStock" # Path - - "partkeepr.part.remove_stock" # Controller - - "PartRemoveStock" # Route name - - resource.part.item_operation.set_stock: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part" # Resource - - [ "PUT" ] # Methods - - "/parts/{id}/setStock" # Path - - "partkeepr.part.set_stock" # Controller - - "PartSetStock" # Route name - - resource.part_attachment.item_operation.custom_get_image: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false @@ -524,11 +444,11 @@ services: public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: - - "@resource.tip_of_the_day" - - "PUT" - - "/tip_of_the_days/{id}/markTipRead" - - "partkeepr.tip_of_the_day.mark_read" - - "TipMarkRead" + - "@resource.tip_of_the_day" # Resource + - "PUT" # Methods + - "/tip_of_the_days/{id}/markTipRead" # Path + - "partkeepr.tip_of_the_day.mark_read" # Controller + - "TipMarkRead" # Route name resource.tip_of_the_day.collection_operation.get: @@ -548,11 +468,11 @@ services: public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: - - "@resource.tip_of_the_day" - - [ "POST" ] - - "/tip_of_the_days/markAllTipsAsUnread" - - "partkeepr.tip_of_the_day.mark_all_unread" - - "TipMarkAllUnrad" + - "@resource.tip_of_the_day" # Resource + - [ "POST" ] # Methods + - "/tip_of_the_days/markAllTipsAsUnread" # Path + - "partkeepr.tip_of_the_day.mark_all_unread" # Controller + - "TipMarkAllUnrad" # Route name resource.tip_of_the_day_history.collection_operation.custom_get: @@ -560,11 +480,11 @@ services: public: false factory: [ "@api.operation_factory", "createCollectionOperation" ] arguments: - - "@resource.tip_of_the_day_history" - - [ "GET" ] - - "/tip_of_the_day_histories" - - "partkeepr.tip_of_the_day_history.collection_get" - - "TipHistoriesGet" + - "@resource.tip_of_the_day_history" # Resource + - [ "GET" ] # Methods + - "/tip_of_the_day_histories" # Path + - "partkeepr.tip_of_the_day_history.collection_get" # Controller + - "TipHistoriesGet" # Route name resource.user.item_operation.get_preferences: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" @@ -665,11 +585,11 @@ services: public: false factory: [ "@api.operation_factory", "createItemOperation" ] arguments: - - "@resource.user" - - [ "DELETE" ] - - "/users/{id}" # Path - - "partkeepr.user.delete" # Controller - - "PartKeeprUserDelete" + - "@resource.user" # Resource + - [ "DELETE" ] # Methods + - "/users/{id}" # Path # Path + - "partkeepr.user.delete" # Controller # Controller + - "PartKeeprUserDelete" # Route name resource.project_report.collection_operation.get: @@ -824,4 +744,3 @@ services: - "/system_preferences" # Path - "partkeepr.system_preference.delete_preference" # Controller - "PartKeeprSystemPreferenceDelete" - diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index 5651ace98..d20310de0 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -20,6 +20,72 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.part.post" # Controller +/** +* @Route( +* name="PartPost", +* path="/parts", +* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_post"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.parts.collection_get" # Controller +/** +* @Route( +* name="PartsGet", +* path="/parts", +* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.part.put" # Controller +/** +* @Route( +* name="PartPut", +* path="/parts/{id}", +* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_put"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.part.add_stock" # Controller +/** +* @Route( +* name="PartAddStock", +* path="/parts/{id}/addStock", +* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="add_stock"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.part.remove_stock" # Controller +/** +* @Route( +* name="PartRemoveStock", +* path="/parts/{id}/removeStock", +* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="remove_stock"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.part.set_stock" # Controller +/** +* @Route( +* name="PartSetStock", +* path="/parts/{id}/setStock", +* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="set_stock"} +* ) +* @Method("PUT") +**/ + /** * Represents a part in the database. The heart of our project. Handle with care! * @@ -30,19 +96,19 @@ * "denormalization_context"={"groups"={"default", "stock"}} * }, * collectionOperations={ - * "custom_get"={"method"="@resource.part.collection_operation.custom_get"}, - * "custom_post"={"method"="@resource.part.collection_operation.custom_post"} + * "custom_get"={"route_name"="PartsGet"}, + * "custom_post"={"route_name"="PartPost"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.part.item_operation.get"}, - * "custom_put"={"method"="@resource.part.item_operation.custom_put"}, - * "delete"={"method"="@resource.part.item_operation.delete"}, - * "add_stock"={"method"="@resource.part.item_operation.add_stock"}, - * "remove_stock"={"method"="@resource.part.item_operation.remove_stock"}, - * "set_stock"={"method"="@resource.part.item_operation.set_stock"} + * "get"={"method"="GET"}, + * "custom_put"={"route_name"="PartPut"}, + * "delete"={"method"="DELETE"}, + * "add_stock"={"route_name"="PartAddStock"}, + * "remove_stock"={"route_name"="PartRemoveStock"}, + * "set_stock"={"route_name"="PartSetStock"} * } * ) * @ORM\Entity From a84846936905d9849f7b3ca03614cca302167ebc Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 10:49:02 +0200 Subject: [PATCH 040/140] phase 3 - operation to annotation - PartAttachment --- app/config/config_partkeepr.yml | 51 ------------------- .../PartBundle/Entity/PartAttachment.php | 43 ++++++++++++++-- 2 files changed, 39 insertions(+), 55 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index be8aa82c0..391dc3e08 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,57 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.part_attachment.item_operation.custom_get_image: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part_attachment" # Resource - - [ "GET" ] # Methods - - "/part_attachments/{id}/getImage" # Path - - "PartKeeprPartBundle:PartAttachment:getImage" # Controller - - "PartAttachmentGetImage" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.part_attachment.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part_attachment" # Resource - - [ "GET" ] # Methods - - "/part_attachments/{id}/getFile" # Path - - "PartKeeprPartBundle:PartAttachment:getFile" # Controller - - "PartAttachmentGet" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.part_attachment.item_operation.custom_get_mime: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part_attachment" # Resource - - [ "GET" ] # Methods - - "/part_attachments/{id}/getMimeTypeIcon" # Path - - "PartKeeprPartBundle:PartAttachment:getMimeTypeIcon" # Controller - - "PartAttachmentMimeTypeIcon" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.part_attachment.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.part_attachment", "GET" ] - resource.part_category.item_operation.move: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" diff --git a/src/PartKeepr/PartBundle/Entity/PartAttachment.php b/src/PartKeepr/PartBundle/Entity/PartAttachment.php index 3d6519c6e..e832e1f0d 100644 --- a/src/PartKeepr/PartBundle/Entity/PartAttachment.php +++ b/src/PartKeepr/PartBundle/Entity/PartAttachment.php @@ -8,6 +8,41 @@ use PartKeepr\UploadedFileBundle\Entity\UploadedFile; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprPartBundle:PartAttachment:getImage" # Controller +/** +* @Route( +* name="PartAttachmentGetImage", +* path="/part_attachments/{id}/getImage", +* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_image"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprPartBundle:PartAttachment:getFile" # Controller +/** +* @Route( +* name="PartAttachmentGet", +* path="/part_attachments/{id}/getFile", +* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprPartBundle:PartAttachment:getMimeTypeIcon" # Controller +/** +* @Route( +* name="PartAttachmentMimeTypeIcon", +* path="/part_attachments/{id}/getMimeTypeIcon", +* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_mime"} +* ) +* @Method("GET") +**/ + + + */ /** * Holds a part attachment. * @@ -21,10 +56,10 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.part_attachment.item_operation.get"}, - * "custom_get"={"method"="@resource.part_attachment.item_operation.custom_get"}, - * "custom_get_mime"={"method"="@resource.part_attachment.item_operation.custom_get_mime"}, - * "custom_get_image"={"method"="@resource.part_attachment.item_operation.custom_get_image"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="PartAttachmentGet","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_get_mime"={"route_name"="PartAttachmentMimeTypeIcon","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_get_image"={"route_name"="PartAttachmentGetImage","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 91f8cba9e9df3dd9cd7eab1086bfb9b2bf337d50 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:04:33 +0200 Subject: [PATCH 041/140] PartAttachment forgotten end of comment - clean --- src/PartKeepr/PartBundle/Entity/PartAttachment.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/PartKeepr/PartBundle/Entity/PartAttachment.php b/src/PartKeepr/PartBundle/Entity/PartAttachment.php index e832e1f0d..6f5821ff1 100644 --- a/src/PartKeepr/PartBundle/Entity/PartAttachment.php +++ b/src/PartKeepr/PartBundle/Entity/PartAttachment.php @@ -41,8 +41,6 @@ * @Method("GET") **/ - - */ /** * Holds a part attachment. * From b6dc642c8715c38112019689e5bfef976c126a2d Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:05:13 +0200 Subject: [PATCH 042/140] phase 3 - operation to annotation - PartCategory --- app/config/config_partkeepr.yml | 43 ------------------- .../PartBundle/Entity/PartCategory.php | 36 +++++++++++++--- 2 files changed, 29 insertions(+), 50 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 391dc3e08..ee5b1b482 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,49 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - - resource.part_category.item_operation.move: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.part_category" # Resource - - [ "PUT" ] # Methods - - "/part_categories/{id}/move" # Path - - "partkeepr.category.move" # Controller - - "PartKeeprPartCategoryMove" - - resource.part_category.collection_operation.get_root: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.part_category" # Resource - - [ "GET" ] # Methods - - "/part_categories/getExtJSRootNode" # Path - - "partkeepr.category.get_root_node" # Controller - - "PartKeeprPartCategoryGetRootNode" - - resource.part_category.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.part_category", "GET" ] - - resource.part_category.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.part_category", "PUT" ] - - resource.part_category.item_operation.delete: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.part_category", "DELETE" ] - - - resource.manufacturer_ic_logo.item_operation.custom_get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/PartBundle/Entity/PartCategory.php b/src/PartKeepr/PartBundle/Entity/PartCategory.php index 552d66891..8b6d0924c 100644 --- a/src/PartKeepr/PartBundle/Entity/PartCategory.php +++ b/src/PartKeepr/PartBundle/Entity/PartCategory.php @@ -12,6 +12,28 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.category.move" # Controller +/** +* @Route( +* name="PartKeeprPartCategoryMove", +* path="/part_categories/{id}/move", +* defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="move"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.category.get_root_node" # Controller +/** +* @Route( +* name="PartKeeprPartCategoryGetRootNode", +* path="/part_categories/getExtJSRootNode", +* defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="get_root"} +* ) +* @Method("GET") +**/ + /** * @ApiResource( * attributes={ @@ -19,18 +41,18 @@ * "denormalization_context"={"groups"={"default", "tree"}} * }, * collectionOperations={ - * "get"={"method"="@resource.part_category.collection_operation.get"}, - * "get_root"={"method"="@resource.part_category.collection_operation.get_root"}, - * "post"={"method"="@resource.part_category.collection_operation.post"} + * "get"={"method"="GET"}, + * "get_root"={"route_name"="PartKeeprPartCategoryGetRootNode"}, + * "post"={"method"="POST"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.part_category.item_operation.get"}, - * "put"={"method"="@resource.part_category.item_operation.put"}, - * "delete"={"method"="@resource.part_category.item_operation.delete"}, - * "move"={"method"="@resource.part_category.item_operation.move"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "delete"={"method"="DELETE"}, + * "move"={"route_name"="PartKeeprPartCategoryMove"} * } * ) * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\NestedTreeRepository") From e88ff66efa1e536bcb47d9314e6b9793c724041e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:16:30 +0200 Subject: [PATCH 043/140] phase 3 - operation to annotation - ManufacturerICLogo --- app/config/config_partkeepr.yml | 28 ------------------- .../Entity/ManufacturerICLogo.php | 17 +++++++++-- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index ee5b1b482..7debc6e9f 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,34 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.manufacturer_ic_logo.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.manufacturer_ic_logo" # Resource - - [ "GET" ] # Methods - - "/manufacturer_i_c_logos/{id}/getImage" # Path - - "PartKeeprManufacturerBundle:ManufacturerIcLogo:getImage" # Controller - - "ManufacturerIcLogoGetImage" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.manufacturer_ic_logo.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.manufacturer_ic_logo", "GET" ] - - resource.manufacturer_ic_logo.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.manufacturer_ic_logo", "PUT" ] - - resource.partmeasurementunit.item_operation.custom_put: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php b/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php index 246303043..7fac06269 100644 --- a/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php +++ b/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php @@ -7,6 +7,17 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprManufacturerBundle:ManufacturerIcLogo:getImage" # Controller +/** +* @Route( +* name="ManufacturerIcLogoGetImage", +* path="/manufacturer_i_c_logos/{id}/getImage", +* defaults={"_api_resource_class"=ManufacturerICLogo::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + /** * Holds a manufacturer IC logo. * @@ -20,9 +31,9 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.manufacturer_ic_logo.item_operation.get"}, - * "put"={"method"="@resource.manufacturer_ic_logo.item_operation.put"}, - * "custom_get"={"method"="@resource.manufacturer_ic_logo.item_operation.custom_get"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "custom_get"={"route_name"="ManufacturerIcLogoGetImage","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 39caf6d530e835282dc6053df1ba930374adcba2 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:23:38 +0200 Subject: [PATCH 044/140] phase 3 - operation to annotation - PartMeasurement-unit --- app/config/config_partkeepr.yml | 28 ------------------- .../PartBundle/Entity/PartMeasurementUnit.php | 17 +++++++++-- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 7debc6e9f..df77e4da0 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,34 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.partmeasurementunit.item_operation.custom_put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.partmeasurementunit" # Resource - - [ "PUT" ] # Methods - - "/part_measurement_units/{id}/setDefault" # Path - - "partkeepr.part_measurement_unit.set_default" # Controller - - "PartMeasurementUnitSetDefault" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.partmeasurementunit.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.partmeasurementunit", "GET" ] - - resource.partmeasurementunit.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.partmeasurementunit", "PUT" ] - - # ######################## Storage Location Categories###################################### resource.storage_location_category.item_operation.move: diff --git a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php index 3a02a8ed0..5519e0a5b 100644 --- a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php +++ b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php @@ -11,6 +11,17 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.part_measurement_unit.set_default" # Controller +/** +* @Route( +* name="PartMeasurementUnitSetDefault", +* path="/part_measurement_units/{id}/setDefault", +* defaults={"_api_resource_class"=PartMeasurementUnit::class, "_api_item_operation_name"="custom_put"} +* ) +* @Method("PUT") +**/ + /** * This entity represents a part measurement unit. Typical measurement units are pieces, centimeters etc. * @@ -24,9 +35,9 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.partmeasurementunit.item_operation.get"}, - * "put"={"method"="@resource.partmeasurementunit.item_operation.put"}, - * "custom_put"={"method"="@resource.partmeasurementunit.item_operation.custom_put"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "custom_put"={"route_name"="PartMeasurementUnitSetDefault","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 2b3e35e1b7b3bed63025bd208248bff6352ab491 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:35:55 +0200 Subject: [PATCH 045/140] phase 3 - operation to annotation - StorageLocationCategory --- app/config/config_partkeepr.yml | 49 ------------------- .../Entity/StorageLocationCategory.php | 36 +++++++++++--- 2 files changed, 29 insertions(+), 56 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index df77e4da0..cb2bb8b80 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,55 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] -# ######################## Storage Location Categories###################################### - - resource.storage_location_category.item_operation.move: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.storage_location_category" # Resource - - [ "PUT" ] # Methods - - "/storage_location_categories/{id}/move" # Path - - "partkeepr.category.move" # Controller - - "StorageLocationCategoryMove" # Route name - - resource.storage_location_category.collection_operation.get_root: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.storage_location_category" # Resource - - [ "GET" ] # Methods - - "/storage_location_categories/getExtJSRootNode" # Path - - "partkeepr.category.get_root_node" # Controller - - "StorageLocationCategoryGetRoot" # Route name - - resource.storage_location_category.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.storage_location_category", "GET" ] - - resource.storage_location_category.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.storage_location_category", "PUT" ] - - resource.storage_location_category.item_operation.delete: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.storage_location_category", "DELETE" ] - - resource.storage_location_category.collection_operation.post: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: [ "@resource.storage_location_category", "POST" ] - - resource.storage_location_image.item_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php index c8476b972..2ed810101 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php @@ -12,6 +12,28 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.category.move" # Controller +/** +* @Route( +* name="StorageLocationCategoryMove", +* path="/storage_location_categories/{id}/move", +* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="move"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.category.get_root_node" # Controller +/** +* @Route( +* name="StorageLocationCategoryGetRoot", +* path="/storage_location_categories/getExtJSRootNode", +* defaults={"_api_resource_class"=StorageLocationCategory::class, "_api_collection_operation_name"="get_root"} +* ) +* @Method("GET") +**/ + /** * @ApiResource( * attributes={ @@ -19,18 +41,18 @@ * "denormalization_context"={"groups"={"default", "tree"}} * }, * collectionOperations={ - * "get"={"method"="@resource.storage_location_category.collection_operation.get"}, - * "get_root"={"method"="@resource.storage_location_category.collection_operation.get_root"}, - * "post"={"method"="@resource.storage_location_category.collection_operation.post"} + * "get"={"method"="GET"}, + * "get_root"={"route_name"="StorageLocationCategoryGetRoot"}, + * "post"={"method"="POST"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.storage_location_category.item_operation.get"}, - * "put"={"method"="@resource.storage_location_category.item_operation.put"}, - * "delete"={"method"="@resource.storage_location_category.item_operation.delete"}, - * "move"={"method"="@resource.storage_location_category.item_operation.move"} + * "get"={"method"="GET"}, + * "put"={"method"="PUT"}, + * "delete"={"method"="DELETE"}, + * "move"={"route_name"="StorageLocationCategoryMove"} * } * ) * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\NestedTreeRepository") From 24a2d7df176fda66d5439e43249b09653dad8e57 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:39:53 +0200 Subject: [PATCH 046/140] copy-paste error, is collection operation PartCategory --- src/PartKeepr/PartBundle/Entity/PartCategory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PartKeepr/PartBundle/Entity/PartCategory.php b/src/PartKeepr/PartBundle/Entity/PartCategory.php index 8b6d0924c..eb5f6c390 100644 --- a/src/PartKeepr/PartBundle/Entity/PartCategory.php +++ b/src/PartKeepr/PartBundle/Entity/PartCategory.php @@ -29,7 +29,7 @@ * @Route( * name="PartKeeprPartCategoryGetRootNode", * path="/part_categories/getExtJSRootNode", -* defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="get_root"} +* defaults={"_api_resource_class"=PartCategory::class, "_api_collection_operation_name"="get_root"} * ) * @Method("GET") **/ From 630bc66b8622d33d5f631273f92af4c0db0e39d3 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:44:17 +0200 Subject: [PATCH 047/140] copy-paste error, is collection operation Part --- src/PartKeepr/PartBundle/Entity/Part.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index d20310de0..ff8f7dc21 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -26,7 +26,7 @@ * @Route( * name="PartPost", * path="/parts", -* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_post"} +* defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_post"} * ) * @Method("POST") **/ @@ -37,7 +37,7 @@ * @Route( * name="PartsGet", * path="/parts", -* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_get"} +* defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_get"} * ) * @Method("GET") **/ From c4abe9b9384bb6310eee0af40fbc6da9715f4b8a Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:46:18 +0200 Subject: [PATCH 048/140] copy-paste error, is collection operation FoorprintCategory --- src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php index c6e7ec3cb..e4998b6a0 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php @@ -14,19 +14,17 @@ // ToDo: fix this - move this Route annotation to the correct place // "partkeepr.category.get_root_node" # Controller - /** * @Route( * name="PartKeeprFootprintCategoryGetRootNode", * path="/footprint_categories/getExtJSRootNode", -* defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="get_root"} +* defaults={"_api_resource_class"=FootprintCategory::class, "_api_collection_operation_name"="get_root"} * ) * @Method("GET") **/ // ToDo: fix this - move this Route annotation to the correct place // "partkeepr.category.move" # Controller - /** * @Route( * name="FootprintCategoryMove", From 934bf511d82b14fafea4136fc7323ca5a2706891 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 11:54:04 +0200 Subject: [PATCH 049/140] phase 3 - operation to annotation - StorageLocationImage --- app/config/config_partkeepr.yml | 22 ------------------- .../Entity/StorageLocationImage.php | 15 +++++++++++-- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index cb2bb8b80..770ce73ab 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,28 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.storage_location_image.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.storage_location_image", "GET" ] - - resource.storage_location_image.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.storage_location_image" # Resource - - [ "GET" ] # Methods - - "/storage_location_images/{id}/getImage" # Path - - "PartKeeprStorageLocationBundle:StorageLocationImage:getImage" # Controller - - "StorageLocationGetImage" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - # ######################## Temporary Images ###################################### resource.tempimage.item_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php index 5429fff74..146a3ac14 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php @@ -7,6 +7,17 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprStorageLocationBundle:StorageLocationImage:getImage" # Controller +/** +* @Route( +* name="StorageLocationGetImage", +* path="/storage_location_images/{id}/getImage", +* defaults={"_api_resource_class"=StorageLocationImage::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + /** * Holds a storage location image. * @@ -20,8 +31,8 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.storage_location_image.item_operation.get"}, - * "custom_get"={"method"="@resource.storage_location_image.item_operation.custom_get"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="StorageLocationGetImage","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From ded2ad53911bf5adf402f1523548df449965ba53 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 12:02:31 +0200 Subject: [PATCH 050/140] phase 3 - operation to annotation - TempImage --- app/config/config_partkeepr.yml | 53 ------------------- .../ImageBundle/Entity/TempImage.php | 41 ++++++++++++-- 2 files changed, 37 insertions(+), 57 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 770ce73ab..385b67a91 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,59 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] -# ######################## Temporary Images ###################################### - resource.tempimage.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.tempimage", "GET" ] - - resource.tempimage.collection_operation.custom_post: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.tempimage" # Resource - - [ "POST" ] # Methods - - "/temp_images/upload" # Path - - "PartKeeprImageBundle:TemporaryImage:upload" # Controller - - "TemporaryImageUpload" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tempimage.collection_operation.custom_post_webcam: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.tempimage" # Resource - - [ "POST" ] # Methods - - "/temp_images/webcamUpload" # Path - - "PartKeeprImageBundle:TemporaryImage:webcamUpload" # Controller - - "TemporaryImageUploadWebcam" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tempimage.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.tempimage" # Resource - - [ "GET" ] # Methods - - "/temp_images/{id}/getImage" # Path - - "PartKeeprImageBundle:TemporaryImage:getImage" # Controller - - "TemporaryImageGet" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tempfile.collection_operation.custom_post: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/ImageBundle/Entity/TempImage.php b/src/PartKeepr/ImageBundle/Entity/TempImage.php index 5eac5fb70..17a445b10 100644 --- a/src/PartKeepr/ImageBundle/Entity/TempImage.php +++ b/src/PartKeepr/ImageBundle/Entity/TempImage.php @@ -6,21 +6,54 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprImageBundle:TemporaryImage:upload" # Controller +/** +* @Route( +* name="TemporaryImageUpload", +* path="/temp_images/upload", +* defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprImageBundle:TemporaryImage:webcamUpload" # Controller +/** +* @Route( +* name="TemporaryImageUploadWebcam", +* path="/temp_images/webcamUpload", +* defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post_webcam"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprImageBundle:TemporaryImage:getImage" # Controller +/** +* @Route( +* name="TemporaryImageGet", +* path="/temp_images/{id}/getImage", +* defaults={"_api_resource_class"=TempImage::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + /** * Represents a temporary image. Temporary images are used when * a user uploaded an image, but not attached it to an entity. * * @ApiResource( * collectionOperations={ - * "custom_post_webcam"={"method"="@resource.tempimage.collection_operation.custom_post_webcam"}, - * "post"={"method"="@resource.tempimage.collection_operation.custom_post"} + * "custom_post_webcam"={"route_name"="TemporaryImageUploadWebcam","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "post"={"route_name"="TemporaryImageUpload","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.tempimage.item_operation.get"}, - * "custom_get"={"method"="@resource.tempimage.item_operation.custom_get"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="TemporaryImageGet","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 330f14ceef6ee2f2ab411d8593b29b7d30f8f423 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 12:16:42 +0200 Subject: [PATCH 051/140] phase 3 - operation to annotation - TempUploadedFile --- app/config/config_partkeepr.yml | 67 ------------------- .../Entity/TempUploadedFile.php | 55 +++++++++++++-- 2 files changed, 50 insertions(+), 72 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 385b67a91..77b734ffb 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,73 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.tempfile.collection_operation.custom_post: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.tempfile" # Resource - - [ "POST" ] # Methods - - "/temp_uploaded_files/upload" # Path - - "PartKeeprUploadedFileBundle:TemporaryFile:upload" # Controller - - "TemporaryFileUpload" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tempfile.collection_operation.custom_post_webcam: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.tempfile" # Resource - - [ "POST" ] # Methods - - "/temp_uploaded_files/webcamUpload" # Path - - "PartKeeprUploadedFileBundle:TemporaryFile:webcamUpload" # Controller - - "TemporaryFileUploadWebcam" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tempfile.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.tempfile", "GET" ] - - resource.tempfile.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.tempfile" # Resource - - [ "GET" ] # Methods - - "/temp_uploaded_files/{id}/getFile" # Path - - "PartKeeprUploadedFileBundle:TemporaryFile:getFile" # Controller - - "TemporaryFileGet" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tempfile.item_operation.custom_get_mimetype: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.tempfile" # Resource - - [ "GET" ] # Methods - - "/temp_uploaded_files/{id}/getMimeTypeIcon" # Path - - "PartKeeprUploadedFileBundle:TemporaryFile:getMimeTypeIcon" # Controller - - "TemporaryFileGetMimeTypeIcon" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.tip_of_the_day.item_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php b/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php index 743229dcd..51149e6ad 100644 --- a/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php +++ b/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php @@ -6,22 +6,67 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprUploadedFileBundle:TemporaryFile:upload" # Controller +/** +* @Route( +* name="TemporaryFileUpload", +* path="/temp_uploaded_files/upload", +* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprUploadedFileBundle:TemporaryFile:webcamUpload" # Controller +/** +* @Route( +* name="TemporaryFileUploadWebcam", +* path="/temp_uploaded_files/webcamUpload", +* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post_webcam"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprUploadedFileBundle:TemporaryFile:getFile" # Controller +/** +* @Route( +* name="TemporaryFileGet", +* path="/temp_uploaded_files/{id}/getFile", +* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprUploadedFileBundle:TemporaryFile:getMimeTypeIcon" # Controller +/** +* @Route( +* name="TemporaryFileGetMimeTypeIcon", +* path="/temp_uploaded_files/{id}/getMimeTypeIcon", +* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get_mimetype"} +* ) +* @Method("GET") +**/ + /** * Represents a temporary file. Temporary files are used when * a user uploaded a file, but not attached it to an entity. * * @ApiResource( * collectionOperations={ - * "post"={"method"="@resource.tempfile.collection_operation.custom_post"} + * "post"={"method"="POST"}, + * "custom_post"={"route_name"="TemporaryFileUpload","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_post_webcam"={"route_name"="TemporaryFileUploadWebcam","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.tempfile.item_operation.get"}, - * "custom_get"={"method"="@resource.tempfile.item_operation.custom_get"}, - * "custom_get_mimetype"={"method"="@resource.tempfile.item_operation.custom_get_mimetype"}, - * "custom_post_webcam"={"method"="@resource.tempfile.collection_operation.custom_post_webcam"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="TemporaryFileGet","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_get_mimetype"={"route_name"="TemporaryFileGetMimeTypeIcon","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 61a145ce6c6883747cbf1cd871bfa5e543023fac Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 12:28:16 +0200 Subject: [PATCH 052/140] phase 3 - operation to annotation - TipOfTheDay --- app/config/config_partkeepr.yml | 42 ------------------- .../TipOfTheDayBundle/Entity/TipOfTheDay.php | 32 +++++++++++--- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 77b734ffb..5ae3c7181 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,48 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.tip_of_the_day.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.tip_of_the_day", "GET" ] - - resource.tip_of_the_day.item_operation.mark_read: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.tip_of_the_day" # Resource - - "PUT" # Methods - - "/tip_of_the_days/{id}/markTipRead" # Path - - "partkeepr.tip_of_the_day.mark_read" # Controller - - "TipMarkRead" # Route name - - - resource.tip_of_the_day.collection_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: [ "@resource.tip_of_the_day", "GET" ] - - resource.tip_of_the_day.collection_operation.post: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: [ "@resource.tip_of_the_day", "POST" ] - - resource.tip_of_the_day.collection_operation.mark_all_unread: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.tip_of_the_day" # Resource - - [ "POST" ] # Methods - - "/tip_of_the_days/markAllTipsAsUnread" # Path - - "partkeepr.tip_of_the_day.mark_all_unread" # Controller - - "TipMarkAllUnrad" # Route name - - resource.tip_of_the_day_history.collection_operation.custom_get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php index 8df90aec0..87426169c 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php @@ -9,6 +9,28 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.tip_of_the_day.mark_all_unread" # Controller +/** +* @Route( +* name="TipMarkAllUnrad", +* path="/tip_of_the_days/markAllTipsAsUnread", +* defaults={"_api_resource_class"=TipOfTheDay, "_api_collection_operation_name"="mark_all_unread"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.tip_of_the_day.mark_read" # Controller +/** +* @Route( +* name="TipMarkRead", +* path="/tip_of_the_days/{id}/markTipRead", +* defaults={"_api_resource_class"=TipOfTheDay, "_api_item_operation_name"="mark_read"} +* ) +* @Method("PUT") +**/ + /** * Represents a tip of the day. * @@ -25,16 +47,16 @@ * "denormalization_context"={"groups"={"default"}} * }, * collectionOperations={ - * "get"={"method"="@resource.tip_of_the_day.collection_operation.get"}, - * "mark_all_unread"={"method"="@resource.tip_of_the_day.collection_operation.mark_all_unread"}, - * "post"={"method"="@resource.tip_of_the_day.collection_operation.post"} + * "get"={"method"="GET"}, + * "mark_all_unread"={"route_name"="TipMarkAllUnrad"}, + * "post"={"method"="POST"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.tip_of_the_day.item_operation.get"}, - * "mark_read"={"method"="@resource.tip_of_the_day.item_operation.mark_read"} + * "get"={"method"="GET"}}, + * "mark_read"={"route_name"="TipMarkRead"} * } * ) * @ORM\Entity From 755c67f2eef41306352a7588a6feb80aa89f8f9c Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 12:32:14 +0200 Subject: [PATCH 053/140] phase 3 - operation to annotation - TipOfTheDayHistory --- app/config/config_partkeepr.yml | 11 ----------- .../TipOfTheDayBundle/Entity/TipOfTheDayHistory.php | 13 ++++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 5ae3c7181..97e4a767c 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,17 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.tip_of_the_day_history.collection_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.tip_of_the_day_history" # Resource - - [ "GET" ] # Methods - - "/tip_of_the_day_histories" # Path - - "partkeepr.tip_of_the_day_history.collection_get" # Controller - - "TipHistoriesGet" # Route name - resource.user.item_operation.get_preferences: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php index bba82ca42..90b6b9e89 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php @@ -10,6 +10,17 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.tip_of_the_day_history.collection_get" # Controller +/** +* @Route( +* name="TipHistoriesGet", +* path="/tip_of_the_day_histories", +* defaults={"_api_resource_class"=TipOfTheDayHistory::class, "_api_collection_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + /** * Represents a tip of the day history entry. * @@ -22,7 +33,7 @@ * "denormalization_context"={"groups"={"default"}} * }, * collectionOperations={ - * "custom_get"={"method"="@resource.tip_of_the_day_history.collection_operation.custom_get"} + * "custom_get"={"route_name"="TipHistoriesGet"} * } * ) * @ORM\Entity From 3f4cad8d1be1313d246357f6e031f5f594d149c7 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 13:56:20 +0200 Subject: [PATCH 054/140] phase 3 - operation to annotation - User --- app/config/config_partkeepr.yml | 106 ------------------ src/PartKeepr/AuthBundle/Entity/User.php | 131 +++++++++++++++++++++-- 2 files changed, 120 insertions(+), 117 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 97e4a767c..e2a9a44ea 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,112 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.user.item_operation.get_preferences: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.user" # Resource - - [ "GET" ] # Methods - - "/user_preferences" # Path - - "partkeepr.user_preference.get_preferences" # Controller - - "PartKeeprUserPreferenceGet" - - resource.user.item_operation.set_preference: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.user" # Resource - - [ "POST", "PUT" ] # Methods - - "/user_preferences" # Path - - "partkeepr.user_preference.set_preference" # Controller - - "PartKeeprUserPreferenceSet" - - resource.user.item_operation.delete_preference: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.user" # Resource - - [ "DELETE" ] # Methods - - "/user_preferences" # Path - - "partkeepr.user_preference.delete_preference" # Controller - - "PartKeeprUserPreferenceDelete" - - resource.user.item_operation.login: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.user" # Resource - - [ "POST" ] # Methods - - "/users/login" # Path - - "partkeepr.auth.login" # Controller - - "PartKeeprAuthLogin" - - resource.user.item_operation.change_password: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.user" # Resource - - [ "PUT" ] # Methods - - "/users/{id}/changePassword" # Path - - "partkeepr.auth.change_password" # Controller - - "PartKeeprAuthChangePassword" - - resource.user.collection_operation.get_providers: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.user" # Resource - - [ "GET" ] # Methods - - "/users/get_user_providers" # Path - - "partkeepr.auth.get_providers" # Controller - - "PartKeeprAuthGetProviders" - - resource.user.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.user", "GET" ] - - resource.user.item_operation.put_custom: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.user" # Resource - - [ "PUT" ] # Methods - - "/users/{id}" # Path - - "partkeepr.user.put" # Controller - - "PartKeeprUserPut" - - resource.user.collection_operation.post_custom: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.user" # Resource - - [ "POST" ] # Methods - - "/users" # Path - - "partkeepr.user.post" # Controller - - "PartKeeprUserPost" - - resource.user.item_operation.delete_custom: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.user" # Resource - - [ "DELETE" ] # Methods - - "/users/{id}" # Path # Path - - "partkeepr.user.delete" # Controller # Controller - - "PartKeeprUserDelete" # Route name - - resource.project_report.collection_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/AuthBundle/Entity/User.php b/src/PartKeepr/AuthBundle/Entity/User.php index 9b23b90d3..b267d8034 100644 --- a/src/PartKeepr/AuthBundle/Entity/User.php +++ b/src/PartKeepr/AuthBundle/Entity/User.php @@ -13,6 +13,115 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user_preference.get_preferences" # Controller +/** +* @Route( +* name="PartKeeprUserPreferenceGet", +* path="/user_preferences", +* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="get_preferences"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user_preference.set_preference" # Controller +/** +* @Route( +* name="PartKeeprUserPreferenceSet", +* path="/user_preferences", +* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} +* ) +* @Method("POST") +**/ +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user_preference.set_preference" # Controller +/** +* @Route( +* name="PartKeeprUserPreferenceSet", +* path="/user_preferences", +* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user.post" # Controller +/** +* @Route( +* name="PartKeeprUserPost", +* path="/users", +* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="post_custom"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.auth.get_providers" # Controller +/** +* @Route( +* name="PartKeeprAuthGetProviders", +* path="/users/get_user_providers", +* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="get_providers"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user.put" # Controller +/** +* @Route( +* name="PartKeeprUserPut", +* path="/users/{id}", +* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="put_custom"} +* ) +* @Method("PUT") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user.delete" # Controller +/** +* @Route( +* name="PartKeeprUserDelete", +* path="/users/{id}", +* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_custom"} +* ) +* @Method("DELETE") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.user_preference.delete_preference" # Controller +/** +* @Route( +* name="PartKeeprUserPreferenceDelete", +* path="/user_preferences", +* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_preference"} +* ) +* @Method("DELETE") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.auth.login" # Controller +/** +* @Route( +* name="PartKeeprAuthLogin", +* path="/users/login", +* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="login"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.auth.change_password" # Controller +/** +* @Route( +* name="PartKeeprAuthChangePassword", +* path="/users/{id}/changePassword", +* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="change_password"} +* ) +* @Method("PUT") +**/ + /** * @ApiResource( * attributes={ @@ -21,22 +130,22 @@ * "denormalization_context"={"groups"={"default"}} * }, * collectionOperations={ - * "get"={"method"="@resource.user.collection_operation.get"}, - * "get_providers"={"method"="@resource.user.collection_operation.get_providers"}, - * "post_custom"={"method"="@resource.user.collection_operation.post_custom"} + * "get"={"method"="GET"}, + * "get_preferences"={"route_name"="PartKeeprUserPreferenceGet"}, + * "set_preference"={"route_name"="PartKeeprUserPreferenceSet"}, + * "post_custom"={"route_name"="PartKeeprUserPost"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.user.item_operation.get"}, - * "put_custom"={"method"="@resource.user.item_operation.put_custom"}, - * "delete_custom"={"method"="@resource.user.item_operation.delete_custom"}, - * "get_preferences"={"method"="@resource.user.item_operation.get_preferences"}, - * "set_preference"={"method"="@resource.user.item_operation.set_preference"}, - * "delete_preference"={"method"="@resource.user.item_operation.delete_preference"}, - * "login"={"method"="@resource.user.item_operation.login"}, - * "change_password"={"method"="@resource.user.item_operation.change_password"} + * "get"={"method"="GET"}, + * "get_providers"={"route_name"="PartKeeprAuthGetProviders"}, + * "put_custom"={"route_name"="PartKeeprUserPut"}, + * "delete_custom"={"route_name"="PartKeeprUserDelete"}, + * "delete_preference"={"route_name"="PartKeeprUserPreferenceDelete"}, + * "login"={"route_name"="PartKeeprAuthLogin"}, + * "change_password"={"route_name"="PartKeeprAuthChangePassword"} * } * ) * @ORM\Entity From 7b884625654f8ca219543712a9374a7e940c312e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 14:04:08 +0200 Subject: [PATCH 055/140] phase 3 - operation to annotation - Report --- app/config/config_partkeepr.yml | 49 ------------------- src/PartKeepr/ProjectBundle/Entity/Report.php | 32 ++++++++++-- 2 files changed, 27 insertions(+), 54 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index e2a9a44ea..2cc7ff23c 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,55 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.project_report.collection_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: [ "@resource.project_report", "GET" ] - - resource.project_report.item_operation.custom_post: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.project_report" # Resource - - [ "POST" ] # Methods - - "/reports" # Path - - "PartKeeprProjectBundle:ProjectReport:createReport" # Controller - - "ProjectReportPost" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.project_report.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.project_report" # Resource - - [ "GET" ] # Methods - - "/reports/{id}" # Path - - "PartKeeprProjectBundle:ProjectReport:getReport" # Controller - - "ProjectReportGet" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.project_report.item_operation.put: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.project_report", "PUT" ] - - resource.project_report.item_operation.delete: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.project_report", "DELETE" ] - - resource.project_attachment.item_operation.custom_get_image: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/ProjectBundle/Entity/Report.php b/src/PartKeepr/ProjectBundle/Entity/Report.php index cc89cdc34..d8f8a0225 100644 --- a/src/PartKeepr/ProjectBundle/Entity/Report.php +++ b/src/PartKeepr/ProjectBundle/Entity/Report.php @@ -11,6 +11,28 @@ use PartKeepr\PartBundle\Entity\Part; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprProjectBundle:ProjectReport:createReport" # Controller +/** +* @Route( +* name="ProjectReportPost", +* path="/reports", +* defaults={"_api_resource_class"=Report::class, "_api_collection_operation_name"="custom_post"} +* ) +* @Method("POST") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprProjectBundle:ProjectReport:getReport" # Controller +/** +* @Route( +* name="ProjectReportGet", +* path="/reports/{id}", +* defaults={"_api_resource_class"=Report::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + /** * Represents a project part. * @@ -21,16 +43,16 @@ * "denormalization_context"={"groups"={"default"}} * }, * collectionOperations={ - * "get"={"method"="@resource.project_report.collection_operation.get"}, - * "custom_post"={"method"="@resource.project_report.item_operation.custom_post"} + * "get"={"method"="GET"}, + * "custom_post"={"route_name"="ProjectReportPost","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "custom_get"={"method"="@resource.project_report.item_operation.custom_get"}, - * "put"={"method"="@resource.project_report.item_operation.put"}, - * "delete"={"method"="@resource.project_report.item_operation.delete"} + * "custom_get"={"route_name"="ProjectReportGet","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "put"={"method"="PUT"}, + * "delete"={"method"="DELETE"} * } * ) * @ORM\Entity From 93c2d0012311756754885d8f9fbfceb4694e37a9 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 14:11:47 +0200 Subject: [PATCH 056/140] phase 3 - operation to annotation - ProjectAttachment --- app/config/config_partkeepr.yml | 53 ------------------- .../Entity/ProjectAttachment.php | 41 ++++++++++++-- 2 files changed, 37 insertions(+), 57 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 2cc7ff23c..9d1f42d9b 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,59 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.project_attachment.item_operation.custom_get_image: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.project_attachment" # Resource - - [ "GET" ] # Methods - - "/project_attachments/{id}/getImage" # Path - - "PartKeeprProjectBundle:ProjectAttachment:getImage" # Controller - - "ProjectAttachmentGetImage" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.project_attachment.item_operation.custom_get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.project_attachment" # Resource - - [ "GET" ] # Methods - - "/project_attachments/{id}/getFile" # Path - - "PartKeeprProjectBundle:ProjectAttachment:getFile" # Controller - - "ProjectAttachmentGet" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.project_attachment.item_operation.custom_get_mime: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.project_attachment" # Resource - - [ "GET" ] # Methods - - "/project_attachments/{id}/getMimeTypeIcon" # Path - - "PartKeeprProjectBundle:ProjectAttachment:getMimeTypeIcon" # Controller - - "ProjectAttachmentMimeTypeIcon" # Route name - - # Context (will be present in Hydra documentation) - "@type": "hydra:Operation" - "hydra:title": "A custom operation" - "returns": "xmls:string" - - resource.project_attachment.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.project_attachment", "GET" ] - - - resource.system_notice.item_operation.get: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php b/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php index d18f66170..fc439bd07 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php @@ -8,6 +8,39 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprProjectBundle:ProjectAttachment:getImage" # Controller +/** +* @Route( +* name="ProjectAttachmentGetImage", +* path="/project_attachments/{id}/getImage", +* defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_image"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprProjectBundle:ProjectAttachment:getFile" # Controller +/** +* @Route( +* name="ProjectAttachmentGet", +* path="/project_attachments/{id}/getFile", +* defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "PartKeeprProjectBundle:ProjectAttachment:getMimeTypeIcon" # Controller +/** +* @Route( +* name="ProjectAttachmentMimeTypeIcon", +* path="/project_attachments/{id}/getMimeTypeIcon", +* defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_mime"} +* ) +* @Method("GET") +**/ + /** * Holds a project attachment. * @@ -21,10 +54,10 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.project_attachment.item_operation.get"}, - * "custom_get"={"method"="@resource.project_attachment.item_operation.custom_get"}, - * "custom_get_mime"={"method"="@resource.project_attachment.item_operation.custom_get_mime"}, - * "custom_get_image"={"method"="@resource.project_attachment.item_operation.custom_get_image"} + * "get"={"method"="GET"}, + * "custom_get"={"route_name"="ProjectAttachmentGet","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_get_mime"={"route_name"="ProjectAttachmentMimeTypeIcon","hydra_context"={"title"="A custom operation","returns"="xmls:string"}}, + * "custom_get_image"={"route_name"="ProjectAttachmentGetImage","hydra_context"={"title"="A custom operation","returns"="xmls:string"}} * } * ) * @ORM\Entity From 60e3554e2bf3b37e6a39772f29b387b5156f32a7 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 14:15:53 +0200 Subject: [PATCH 057/140] phase 3 - operation to annotation - SystemNotice --- app/config/config_partkeepr.yml | 18 ------------------ .../CoreBundle/Entity/SystemNotice.php | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 9d1f42d9b..3f68624d4 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -92,24 +92,6 @@ services: - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - resource.system_notice.item_operation.get: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: [ "@resource.system_notice", "GET" ] - - resource.system_notice.item_operation.acknowledge: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.system_notice" # Resource - - [ "PUT" ] # Methods - - "/system_notices/{id}/acknowledge" # Path - - "partkeepr.system_notice.acknowledge" # Controller - - "SystemNoticeAcknowledge" # Route name - - resource.system_preference.item_operation.get_preferences: class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" public: false diff --git a/src/PartKeepr/CoreBundle/Entity/SystemNotice.php b/src/PartKeepr/CoreBundle/Entity/SystemNotice.php index 60d548292..9a9eee25c 100644 --- a/src/PartKeepr/CoreBundle/Entity/SystemNotice.php +++ b/src/PartKeepr/CoreBundle/Entity/SystemNotice.php @@ -8,6 +8,17 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.system_notice.acknowledge" # Controller +/** +* @Route( +* name="SystemNoticeAcknowledge", +* path="/system_notices/{id}/acknowledge", +* defaults={"_api_resource_class"=SystemNotice::class, "_api_item_operation_name"="acknowledge"} +* ) +* @Method("PUT") +**/ + /** * Holds a system notice. * @@ -21,8 +32,8 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="@resource.system_notice.item_operation.get"}, - * "acknowledge"={"method"="@resource.system_notice.item_operation.acknowledge"} + * "get"={"method"="GET"}, + * "acknowledge"={"route_name"="SystemNoticeAcknowledge"} * } * ) * @ORM\Entity From 2c3296273b265499f435766f79b97309db3d1fa1 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 14:25:34 +0200 Subject: [PATCH 058/140] phase 3 - operation to annotation - SystemPreference --- app/config/config_partkeepr.yml | 33 ------------- .../Entity/SystemPreference.php | 49 +++++++++++++++++-- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/app/config/config_partkeepr.yml b/app/config/config_partkeepr.yml index 3f68624d4..74595da07 100644 --- a/app/config/config_partkeepr.yml +++ b/app/config/config_partkeepr.yml @@ -91,36 +91,3 @@ services: - "@property_accessor" - "@api.iri_converter" tags: [ { name: "kernel.event_listener", event: "kernel.view", method: "replaceTemporaryFile", priority: 100 } ] - - resource.system_preference.item_operation.get_preferences: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.system_preference" # Resource - - [ "GET" ] # Methods - - "/system_preferences" # Path - - "partkeepr.system_preference.get_preferences" # Controller - - "PartKeeprSystemPreferenceGet" - - resource.system_preference.item_operation.set_preference: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createCollectionOperation" ] - arguments: - - "@resource.system_preference" # Resource - - [ "POST", "PUT" ] # Methods - - "/system_preferences" # Path - - "partkeepr.system_preference.set_preference" # Controller - - "PartKeeprSystemPreferenceSet" - - resource.system_preference.item_operation.delete_preference: - class: "Dunglas\\ApiBundle\\Api\\Operation\\Operation" - public: false - factory: [ "@api.operation_factory", "createItemOperation" ] - arguments: - - "@resource.system_preference" # Resource - - [ "DELETE" ] # Methods - - "/system_preferences" # Path - - "partkeepr.system_preference.delete_preference" # Controller - - "PartKeeprSystemPreferenceDelete" diff --git a/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php b/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php index 27e206e4d..09bf77072 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php +++ b/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php @@ -9,6 +9,49 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.system_preference.get_preferences" # Controller +/** +* @Route( +* name="PartKeeprSystemPreferenceGet", +* path="/system_preferences", +* defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="get_preferences"} +* ) +* @Method("GET") +**/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.system_preference.set_preference" # Controller +/** +* @Route( +* name="PartKeeprSystemPreferenceSet", +* path="/system_preferences", +* defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} +* ) +* @Method("POST") +**/ +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.system_preference.set_preference" # Controller +/** + * @Route( + * name="PartKeeprSystemPreferenceSet", + * path="/system_preferences", + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} + * ) + * @Method("PUT") + **/ + +// ToDo: fix this - move this Route annotation to the correct place +// "partkeepr.system_preference.delete_preference" # Controller +/** +* @Route( +* name="PartKeeprSystemPreferenceDelete", +* path="/system_preferences", +* defaults={"_api_resource_class"=SystemPreference::class, "_api_item_operation_name"="delete_preference"} +* ) +* @Method("DELETE") +**/ + /** * Represents a system preference entry. * @@ -23,14 +66,14 @@ * "denormalization_context"={"groups"={"default"}} * }, * collectionOperations={ - * "get_preferences"={"method"="@resource.system_preference.item_operation.get_preferences"} + * "get_preferences"={"route_name"="PartKeeprSystemPreferenceGet"}, + * "set_preference"={"route_name"="PartKeeprSystemPreferenceSet"} * }, * itemOperations={ * "swagger"= { * "method"="GET", * }, - * "set_preference"={"method"="@resource.system_preference.item_operation.set_preference"}, - * "delete_preference"={"method"="@resource.system_preference.item_operation.delete_preference"} + * "delete_preference"={"route_name"="PartKeeprSystemPreferenceDelete"} * } * ) * @ORM\Entity From 0db54ca821a369c0a328bc49c3135c7bf409a92d Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 14:32:53 +0200 Subject: [PATCH 059/140] phase 4 - place Route - SystemPreference --- .../Action/DeletePreferenceAction.php | 12 ++++++ .../Action/GetPreferencesAction.php | 10 +++++ .../Action/SetPreferenceAction.php | 20 +++++++++ .../Entity/SystemPreference.php | 43 ------------------- 4 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php index 0122dfe48..33d2bdccf 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php @@ -36,6 +36,18 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.system_preference.delete_preference" # Controller + /** + * @Route( + * name="PartKeeprSystemPreferenceDelete", + * path="/system_preferences", + * defaults={"_api_resource_class"=SystemPreference::class, "_api_item_operation_name"="delete_preference"} + * ) + * @Method("DELETE") + **/ + public function __invoke(Request $request) { if ($request->request->has('preferenceKey')) { diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php index bc12179fc..6db2b2f25 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php @@ -45,6 +45,16 @@ public function __construct( * * @return JsonResponse */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.system_preference.get_preferences" # Controller + /** + * @Route( + * name="PartKeeprSystemPreferenceGet", + * path="/system_preferences", + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="get_preferences"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { $preferences = $this->systemPreferenceService->getPreferences(); diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php index 7d2a5410b..01bc8c1b5 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php @@ -46,6 +46,26 @@ public function __construct( * * @return JsonResponse */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.system_preference.set_preference" # Controller + /** + * @Route( + * name="PartKeeprSystemPreferenceSet", + * path="/system_preferences", + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} + * ) + * @Method("POST") + **/ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.system_preference.set_preference" # Controller + /** + * @Route( + * name="PartKeeprSystemPreferenceSet", + * path="/system_preferences", + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request) { $data = json_decode($request->getContent()); diff --git a/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php b/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php index 09bf77072..5fa78066d 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php +++ b/src/PartKeepr/SystemPreferenceBundle/Entity/SystemPreference.php @@ -9,49 +9,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.system_preference.get_preferences" # Controller -/** -* @Route( -* name="PartKeeprSystemPreferenceGet", -* path="/system_preferences", -* defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="get_preferences"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.system_preference.set_preference" # Controller -/** -* @Route( -* name="PartKeeprSystemPreferenceSet", -* path="/system_preferences", -* defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} -* ) -* @Method("POST") -**/ -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.system_preference.set_preference" # Controller -/** - * @Route( - * name="PartKeeprSystemPreferenceSet", - * path="/system_preferences", - * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} - * ) - * @Method("PUT") - **/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.system_preference.delete_preference" # Controller -/** -* @Route( -* name="PartKeeprSystemPreferenceDelete", -* path="/system_preferences", -* defaults={"_api_resource_class"=SystemPreference::class, "_api_item_operation_name"="delete_preference"} -* ) -* @Method("DELETE") -**/ - /** * Represents a system preference entry. * From 341dd6fb040f4ad5cb606b93fda7161b17642bac Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 14:35:43 +0200 Subject: [PATCH 060/140] phase 4 - place Route - SystemNotice --- .../Action/SystemNoticeAcknowledgeAction.php | 11 +++++++++++ src/PartKeepr/CoreBundle/Entity/SystemNotice.php | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php index c66284bc3..266a52e52 100644 --- a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php +++ b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php @@ -41,6 +41,17 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.system_notice.acknowledge" # Controller + /** + * @Route( + * name="SystemNoticeAcknowledge", + * path="/system_notices/{id}/acknowledge", + * defaults={"_api_resource_class"=SystemNotice::class, "_api_item_operation_name"="acknowledge"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CoreBundle/Entity/SystemNotice.php b/src/PartKeepr/CoreBundle/Entity/SystemNotice.php index 9a9eee25c..7757857ac 100644 --- a/src/PartKeepr/CoreBundle/Entity/SystemNotice.php +++ b/src/PartKeepr/CoreBundle/Entity/SystemNotice.php @@ -8,17 +8,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.system_notice.acknowledge" # Controller -/** -* @Route( -* name="SystemNoticeAcknowledge", -* path="/system_notices/{id}/acknowledge", -* defaults={"_api_resource_class"=SystemNotice::class, "_api_item_operation_name"="acknowledge"} -* ) -* @Method("PUT") -**/ - /** * Holds a system notice. * From 43af33f097121b5669d0446f8e64ebb45e5c1509 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 15:06:47 +0200 Subject: [PATCH 061/140] phase 4 - place Route - User --- .../Action/ChangePasswordAction.php | 10 ++ .../Action/DeletePreferenceAction.php | 10 ++ .../AuthBundle/Action/DeleteUserAction.php | 10 ++ .../Action/GetPreferencesAction.php | 10 ++ .../AuthBundle/Action/LoginAction.php | 10 ++ .../AuthBundle/Action/PostUserAction.php | 10 ++ .../AuthBundle/Action/PutUserAction.php | 10 ++ .../AuthBundle/Action/SetPreferenceAction.php | 20 ++++ src/PartKeepr/AuthBundle/Entity/User.php | 98 ------------------- 9 files changed, 90 insertions(+), 98 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php b/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php index ec620db27..22c719da7 100644 --- a/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php +++ b/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php @@ -55,6 +55,16 @@ public function __construct( $this->container = $container; } + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.auth.change_password" # Controller + /** + * @Route( + * name="PartKeeprAuthChangePassword", + * path="/users/{id}/changePassword", + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="change_password"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request) { if ($this->container->hasParameter('partkeepr.auth.allow_password_change') && diff --git a/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php b/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php index b09c83548..42dcc90a5 100644 --- a/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php @@ -44,6 +44,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user_preference.delete_preference" # Controller + /** + * @Route( + * name="PartKeeprUserPreferenceDelete", + * path="/user_preferences", + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_preference"} + * ) + * @Method("DELETE") + **/ public function __invoke(Request $request) { $user = $this->userService->getUser(); diff --git a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php index 526f2bf3c..5443f73c1 100644 --- a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php @@ -56,6 +56,16 @@ public function __construct( * * @return mixed */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user.delete" # Controller + /** + * @Route( + * name="PartKeeprUserDelete", + * path="/users/{id}", + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_custom"} + * ) + * @Method("DELETE") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php b/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php index 64f0d46c9..56e489b74 100644 --- a/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php +++ b/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php @@ -53,6 +53,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user_preference.get_preferences" # Controller + /** + * @Route( + * name="PartKeeprUserPreferenceGet", + * path="/user_preferences", + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="get_preferences"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { $user = $this->userService->getUser(); diff --git a/src/PartKeepr/AuthBundle/Action/LoginAction.php b/src/PartKeepr/AuthBundle/Action/LoginAction.php index 14e029be9..6522a1374 100644 --- a/src/PartKeepr/AuthBundle/Action/LoginAction.php +++ b/src/PartKeepr/AuthBundle/Action/LoginAction.php @@ -37,6 +37,16 @@ public function __construct( $this->userPreferenceService = $userPreferenceService; } + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.auth.login" # Controller + /** + * @Route( + * name="PartKeeprAuthLogin", + * path="/users/login", + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="login"} + * ) + * @Method("POST") + **/ public function __invoke(Request $request) { $user = $this->userService->getUser(); diff --git a/src/PartKeepr/AuthBundle/Action/PostUserAction.php b/src/PartKeepr/AuthBundle/Action/PostUserAction.php index 099b459a3..c031a40bf 100644 --- a/src/PartKeepr/AuthBundle/Action/PostUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PostUserAction.php @@ -53,6 +53,16 @@ public function __construct( * * @return mixed */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user.post" # Controller + /** + * @Route( + * name="PartKeeprUserPost", + * path="/users", + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="post_custom"} + * ) + * @Method("POST") + **/ public function __invoke(Request $request) { /** diff --git a/src/PartKeepr/AuthBundle/Action/PutUserAction.php b/src/PartKeepr/AuthBundle/Action/PutUserAction.php index ba1eedaf2..c2fdbebc6 100644 --- a/src/PartKeepr/AuthBundle/Action/PutUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PutUserAction.php @@ -56,6 +56,16 @@ public function __construct( * * @return mixed */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user.put" # Controller + /** + * @Route( + * name="PartKeeprUserPut", + * path="/users/{id}", + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="put_custom"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { /** diff --git a/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php b/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php index c31e1697a..32842bc8e 100644 --- a/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php +++ b/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php @@ -54,6 +54,26 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user_preference.set_preference" # Controller + /** + * @Route( + * name="PartKeeprUserPreferenceSet", + * path="/user_preferences", + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} + * ) + * @Method("POST") + **/ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.user_preference.set_preference" # Controller + /** + * @Route( + * name="PartKeeprUserPreferenceSet", + * path="/user_preferences", + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request) { $user = $this->userService->getUser(); diff --git a/src/PartKeepr/AuthBundle/Entity/User.php b/src/PartKeepr/AuthBundle/Entity/User.php index b267d8034..55ca7188b 100644 --- a/src/PartKeepr/AuthBundle/Entity/User.php +++ b/src/PartKeepr/AuthBundle/Entity/User.php @@ -13,49 +13,6 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user_preference.get_preferences" # Controller -/** -* @Route( -* name="PartKeeprUserPreferenceGet", -* path="/user_preferences", -* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="get_preferences"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user_preference.set_preference" # Controller -/** -* @Route( -* name="PartKeeprUserPreferenceSet", -* path="/user_preferences", -* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} -* ) -* @Method("POST") -**/ -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user_preference.set_preference" # Controller -/** -* @Route( -* name="PartKeeprUserPreferenceSet", -* path="/user_preferences", -* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user.post" # Controller -/** -* @Route( -* name="PartKeeprUserPost", -* path="/users", -* defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="post_custom"} -* ) -* @Method("POST") -**/ - // ToDo: fix this - move this Route annotation to the correct place // "partkeepr.auth.get_providers" # Controller /** @@ -67,61 +24,6 @@ * @Method("GET") **/ -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user.put" # Controller -/** -* @Route( -* name="PartKeeprUserPut", -* path="/users/{id}", -* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="put_custom"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user.delete" # Controller -/** -* @Route( -* name="PartKeeprUserDelete", -* path="/users/{id}", -* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_custom"} -* ) -* @Method("DELETE") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.user_preference.delete_preference" # Controller -/** -* @Route( -* name="PartKeeprUserPreferenceDelete", -* path="/user_preferences", -* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_preference"} -* ) -* @Method("DELETE") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.auth.login" # Controller -/** -* @Route( -* name="PartKeeprAuthLogin", -* path="/users/login", -* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="login"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.auth.change_password" # Controller -/** -* @Route( -* name="PartKeeprAuthChangePassword", -* path="/users/{id}/changePassword", -* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="change_password"} -* ) -* @Method("PUT") -**/ - /** * @ApiResource( * attributes={ From 62b1e3932e0482c578b56d048a146dfbd2202823 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 15:10:21 +0200 Subject: [PATCH 062/140] phase 4 - place Route - TipOfTheDayHistory --- .../Action/GetTipHistoryCollectionAction.php | 10 ++++++++++ .../TipOfTheDayBundle/Entity/TipOfTheDayHistory.php | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php index c2682787e..485c54e20 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php @@ -38,6 +38,16 @@ public function __construct(DataProviderInterface $dataProvider, UserService $us * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.tip_of_the_day_history.collection_get" # Controller + /** + * @Route( + * name="TipHistoriesGet", + * path="/tip_of_the_day_histories", + * defaults={"_api_resource_class"=TipOfTheDayHistory::class, "_api_collection_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php index 90b6b9e89..af2de82a6 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDayHistory.php @@ -10,17 +10,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.tip_of_the_day_history.collection_get" # Controller -/** -* @Route( -* name="TipHistoriesGet", -* path="/tip_of_the_day_histories", -* defaults={"_api_resource_class"=TipOfTheDayHistory::class, "_api_collection_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - /** * Represents a tip of the day history entry. * From 6f136242c310b5e22142f9beefb8ff4ced7c41b1 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 15:12:17 +0200 Subject: [PATCH 063/140] phase 4 - place Route - TipOfTheDay --- .../Action/MarkTipReadAction.php | 10 +++++++++ .../Action/MarkTipsAsUnreadAction.php | 10 +++++++++ .../TipOfTheDayBundle/Entity/TipOfTheDay.php | 22 ------------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php index ac686f1e6..3bcb64222 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php @@ -50,6 +50,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.tip_of_the_day.mark_read" # Controller + /** + * @Route( + * name="TipMarkRead", + * path="/tip_of_the_days/{id}/markTipRead", + * defaults={"_api_resource_class"=TipOfTheDay, "_api_item_operation_name"="mark_read"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php index b1d43135f..64aeb6e32 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php @@ -38,6 +38,16 @@ public function __construct(EntityManager $entityManager, UserService $userServi * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.tip_of_the_day.mark_all_unread" # Controller + /** + * @Route( + * name="TipMarkAllUnrad", + * path="/tip_of_the_days/markAllTipsAsUnread", + * defaults={"_api_resource_class"=TipOfTheDay, "_api_collection_operation_name"="mark_all_unread"} + * ) + * @Method("POST") + **/ public function __invoke(Request $request) { $dql = "DELETE FROM PartKeepr\TipOfTheDayBundle\Entity\TipOfTheDayHistory th WHERE th.user = :user"; diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php index 87426169c..eee034f0b 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php @@ -9,28 +9,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.tip_of_the_day.mark_all_unread" # Controller -/** -* @Route( -* name="TipMarkAllUnrad", -* path="/tip_of_the_days/markAllTipsAsUnread", -* defaults={"_api_resource_class"=TipOfTheDay, "_api_collection_operation_name"="mark_all_unread"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.tip_of_the_day.mark_read" # Controller -/** -* @Route( -* name="TipMarkRead", -* path="/tip_of_the_days/{id}/markTipRead", -* defaults={"_api_resource_class"=TipOfTheDay, "_api_item_operation_name"="mark_read"} -* ) -* @Method("PUT") -**/ - /** * Represents a tip of the day. * From 4c07b640f8ded110e0432873899286a5a67324d1 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 15:29:26 +0200 Subject: [PATCH 064/140] phase 4 - place Route - User (getProvider) --- src/PartKeepr/AuthBundle/Entity/User.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Entity/User.php b/src/PartKeepr/AuthBundle/Entity/User.php index 55ca7188b..a8765397a 100644 --- a/src/PartKeepr/AuthBundle/Entity/User.php +++ b/src/PartKeepr/AuthBundle/Entity/User.php @@ -13,17 +13,6 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.auth.get_providers" # Controller -/** -* @Route( -* name="PartKeeprAuthGetProviders", -* path="/users/get_user_providers", -* defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="get_providers"} -* ) -* @Method("GET") -**/ - /** * @ApiResource( * attributes={ @@ -270,6 +259,16 @@ public function setEmail($email) * * @return UserProvider */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.auth.get_providers" # Controller + /** + * @Route( + * name="PartKeeprAuthGetProviders", + * path="/users/get_user_providers", + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="get_providers"} + * ) + * @Method("GET") + **/ public function getProvider() { return $this->provider; From f1640ebdf39b3d458cb9fbbe2068d3b5342d49d6 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 15:44:05 +0200 Subject: [PATCH 065/140] phase 4 - place Route - ProjectAttachment --- .../Controller/ImageController.php | 10 ++++++ .../Entity/ProjectAttachment.php | 33 ------------------- .../Controller/FileController.php | 20 +++++++++++ 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index 2133559d2..181faf348 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -31,6 +31,16 @@ abstract class ImageController extends FileController * * @return ImageResponse|Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprProjectBundle:ProjectAttachment:getImage" # Controller + /** + * @Route( + * name="ProjectAttachmentGetImage", + * path="/project_attachments/{id}/getImage", + * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_image"} + * ) + * @Method("GET") + **/ public function getImageAction(Request $request, $id) { /** diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php b/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php index fc439bd07..609f51832 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectAttachment.php @@ -8,39 +8,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprProjectBundle:ProjectAttachment:getImage" # Controller -/** -* @Route( -* name="ProjectAttachmentGetImage", -* path="/project_attachments/{id}/getImage", -* defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_image"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprProjectBundle:ProjectAttachment:getFile" # Controller -/** -* @Route( -* name="ProjectAttachmentGet", -* path="/project_attachments/{id}/getFile", -* defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprProjectBundle:ProjectAttachment:getMimeTypeIcon" # Controller -/** -* @Route( -* name="ProjectAttachmentMimeTypeIcon", -* path="/project_attachments/{id}/getMimeTypeIcon", -* defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_mime"} -* ) -* @Method("GET") -**/ - /** * Holds a project attachment. * diff --git a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php index 90ff58747..01e1934b5 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php @@ -17,6 +17,16 @@ abstract class FileController extends Controller * * @return Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprProjectBundle:ProjectAttachment:getMimeTypeIcon" # Controller + /** + * @Route( + * name="ProjectAttachmentMimeTypeIcon", + * path="/project_attachments/{id}/getMimeTypeIcon", + * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_mime"} + * ) + * @Method("GET") + **/ public function getMimeTypeIconAction($id) { /** @@ -41,6 +51,16 @@ public function getMimeTypeIconAction($id) * * @return Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprProjectBundle:ProjectAttachment:getFile" # Controller + /** + * @Route( + * name="ProjectAttachmentGet", + * path="/project_attachments/{id}/getFile", + * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getFileAction($id) { /** From 3e6a2fbed8461d340a3a17af203e6dc15de96b01 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 15:48:52 +0200 Subject: [PATCH 066/140] phase 4 - place Route - Report --- .../Controller/ProjectReportController.php | 20 +++++++++++++++++ src/PartKeepr/ProjectBundle/Entity/Report.php | 22 ------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php index 01268408e..2bbbc946e 100644 --- a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php +++ b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php @@ -20,6 +20,16 @@ class ProjectReportController extends FOSRestController * * @return \Symfony\Component\HttpFoundation\Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprProjectBundle:ProjectReport:createReport" # Controller + /** + * @Route( + * name="ProjectReportPost", + * path="/reports", + * defaults={"_api_resource_class"=Report::class, "_api_collection_operation_name"="custom_post"} + * ) + * @Method("POST") + **/ public function createReportAction(Request $request) { /** @@ -72,6 +82,16 @@ public function createReportAction(Request $request) * * @return \Symfony\Component\HttpFoundation\Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprProjectBundle:ProjectReport:getReport" # Controller + /** + * @Route( + * name="ProjectReportGet", + * path="/reports/{id}", + * defaults={"_api_resource_class"=Report::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getReportAction(Request $request, $id) { /** diff --git a/src/PartKeepr/ProjectBundle/Entity/Report.php b/src/PartKeepr/ProjectBundle/Entity/Report.php index d8f8a0225..1ad1f3f9b 100644 --- a/src/PartKeepr/ProjectBundle/Entity/Report.php +++ b/src/PartKeepr/ProjectBundle/Entity/Report.php @@ -11,28 +11,6 @@ use PartKeepr\PartBundle\Entity\Part; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprProjectBundle:ProjectReport:createReport" # Controller -/** -* @Route( -* name="ProjectReportPost", -* path="/reports", -* defaults={"_api_resource_class"=Report::class, "_api_collection_operation_name"="custom_post"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprProjectBundle:ProjectReport:getReport" # Controller -/** -* @Route( -* name="ProjectReportGet", -* path="/reports/{id}", -* defaults={"_api_resource_class"=Report::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - /** * Represents a project part. * From 3ada58f418a4e6464db684dba9c8119176757ab2 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:04:25 +0200 Subject: [PATCH 067/140] phase 4 - place Route - TempUploadFile --- .../Controller/FileController.php | 20 +++++++++ .../Controller/TemporaryFileController.php | 20 +++++++++ .../Entity/TempUploadedFile.php | 44 ------------------- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php index 01e1934b5..f27513887 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php @@ -27,6 +27,16 @@ abstract class FileController extends Controller * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprUploadedFileBundle:TemporaryFile:getMimeTypeIcon" # Controller + /** + * @Route( + * name="TemporaryFileGetMimeTypeIcon", + * path="/temp_uploaded_files/{id}/getMimeTypeIcon", + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get_mimetype"} + * ) + * @Method("GET") + **/ public function getMimeTypeIconAction($id) { /** @@ -61,6 +71,16 @@ public function getMimeTypeIconAction($id) * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprUploadedFileBundle:TemporaryFile:getFile" # Controller + /** + * @Route( + * name="TemporaryFileGet", + * path="/temp_uploaded_files/{id}/getFile", + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getFileAction($id) { /** diff --git a/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php b/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php index 1c2de3eb7..5a4611031 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php @@ -32,6 +32,16 @@ class TemporaryFileController extends FileController * * @return JsonResponse The JSON response from the temporary file upload */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprUploadedFileBundle:TemporaryFile:upload" # Controller + /** + * @Route( + * name="TemporaryFileUpload", + * path="/temp_uploaded_files/upload", + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post"} + * ) + * @Method("POST") + **/ public function uploadAction(Request $request) { $uploadedFile = new TempUploadedFile(); @@ -103,6 +113,16 @@ public function uploadAction(Request $request) * * @return Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprUploadedFileBundle:TemporaryFile:webcamUpload" # Controller + /** + * @Route( + * name="TemporaryFileUploadWebcam", + * path="/temp_uploaded_files/webcamUpload", + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post_webcam"} + * ) + * @Method("POST") + **/ public function webcamUploadAction(Request $request) { $file = new TempUploadedFile(); diff --git a/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php b/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php index 51149e6ad..060ac399e 100644 --- a/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php +++ b/src/PartKeepr/UploadedFileBundle/Entity/TempUploadedFile.php @@ -6,50 +6,6 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprUploadedFileBundle:TemporaryFile:upload" # Controller -/** -* @Route( -* name="TemporaryFileUpload", -* path="/temp_uploaded_files/upload", -* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprUploadedFileBundle:TemporaryFile:webcamUpload" # Controller -/** -* @Route( -* name="TemporaryFileUploadWebcam", -* path="/temp_uploaded_files/webcamUpload", -* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post_webcam"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprUploadedFileBundle:TemporaryFile:getFile" # Controller -/** -* @Route( -* name="TemporaryFileGet", -* path="/temp_uploaded_files/{id}/getFile", -* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprUploadedFileBundle:TemporaryFile:getMimeTypeIcon" # Controller -/** -* @Route( -* name="TemporaryFileGetMimeTypeIcon", -* path="/temp_uploaded_files/{id}/getMimeTypeIcon", -* defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get_mimetype"} -* ) -* @Method("GET") -**/ - /** * Represents a temporary file. Temporary files are used when * a user uploaded a file, but not attached it to an entity. From 7439cc7cecbfee2f1edd053a3f27b6e832a307d8 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:18:07 +0200 Subject: [PATCH 068/140] phase 4 - place Route - TempImage --- .../Controller/ImageController.php | 10 ++++++ .../Controller/TemporaryImageController.php | 20 +++++++++++ .../ImageBundle/Entity/TempImage.php | 33 ------------------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index 181faf348..e8c8b6414 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -41,6 +41,16 @@ abstract class ImageController extends FileController * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprImageBundle:TemporaryImage:getImage" # Controller + /** + * @Route( + * name="TemporaryImageGet", + * path="/temp_images/{id}/getImage", + * defaults={"_api_resource_class"=TempImage::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getImageAction(Request $request, $id) { /** diff --git a/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php b/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php index 8469a2e53..9dac7b3be 100644 --- a/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php @@ -31,6 +31,16 @@ class TemporaryImageController extends ImageController * * @return JsonResponse The JSON response from the temporary image upload */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprImageBundle:TemporaryImage:upload" # Controller + /** + * @Route( + * name="TemporaryImageUpload", + * path="/temp_images/upload", + * defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post"} + * ) + * @Method("POST") + **/ public function uploadAction(Request $request) { $image = new TempImage(); @@ -73,6 +83,16 @@ public function uploadAction(Request $request) * * @return Response */ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprImageBundle:TemporaryImage:webcamUpload" # Controller + /** + * @Route( + * name="TemporaryImageUploadWebcam", + * path="/temp_images/webcamUpload", + * defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post_webcam"} + * ) + * @Method("POST") + **/ public function webcamUploadAction(Request $request) { $image = new TempImage(); diff --git a/src/PartKeepr/ImageBundle/Entity/TempImage.php b/src/PartKeepr/ImageBundle/Entity/TempImage.php index 17a445b10..39443b1f3 100644 --- a/src/PartKeepr/ImageBundle/Entity/TempImage.php +++ b/src/PartKeepr/ImageBundle/Entity/TempImage.php @@ -6,39 +6,6 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprImageBundle:TemporaryImage:upload" # Controller -/** -* @Route( -* name="TemporaryImageUpload", -* path="/temp_images/upload", -* defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprImageBundle:TemporaryImage:webcamUpload" # Controller -/** -* @Route( -* name="TemporaryImageUploadWebcam", -* path="/temp_images/webcamUpload", -* defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post_webcam"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprImageBundle:TemporaryImage:getImage" # Controller -/** -* @Route( -* name="TemporaryImageGet", -* path="/temp_images/{id}/getImage", -* defaults={"_api_resource_class"=TempImage::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - /** * Represents a temporary image. Temporary images are used when * a user uploaded an image, but not attached it to an entity. From 71df159a41c40e3424082da085378d4b4cd091db Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:20:58 +0200 Subject: [PATCH 069/140] phase 4 - place Route - StorageLocationImage --- .../ImageBundle/Controller/ImageController.php | 10 ++++++++++ .../Entity/StorageLocationImage.php | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index e8c8b6414..ed11254c9 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -51,6 +51,16 @@ abstract class ImageController extends FileController * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprStorageLocationBundle:StorageLocationImage:getImage" # Controller + /** + * @Route( + * name="StorageLocationGetImage", + * path="/storage_location_images/{id}/getImage", + * defaults={"_api_resource_class"=StorageLocationImage::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getImageAction(Request $request, $id) { /** diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php index 146a3ac14..532652c09 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationImage.php @@ -7,17 +7,6 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprStorageLocationBundle:StorageLocationImage:getImage" # Controller -/** -* @Route( -* name="StorageLocationGetImage", -* path="/storage_location_images/{id}/getImage", -* defaults={"_api_resource_class"=StorageLocationImage::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - /** * Holds a storage location image. * From 35820a2e33b2a8330adfc81cc0f32cc3884908b7 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:35:42 +0200 Subject: [PATCH 070/140] phase 4 - place Route - StorageLocationCategory --- .../Action/GetRootNodeAction.php | 10 +++++++++ .../CategoryBundle/Action/MoveAction.php | 10 +++++++++ .../Resources/config/actions.xml | 2 ++ .../Entity/StorageLocationCategory.php | 22 ------------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php index fbd112910..91620cc03 100644 --- a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php +++ b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php @@ -36,6 +36,16 @@ public function __construct(ManagerRegistry $manager) * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.category.get_root_node" # Controller + /** + * @Route( + * name="StorageLocationCategoryGetRoot", + * path="/storage_location_categories/getExtJSRootNode", + * defaults={"_api_resource_class"=StorageLocationCategory::class, "_api_collection_operation_name"="get_root"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CategoryBundle/Action/MoveAction.php b/src/PartKeepr/CategoryBundle/Action/MoveAction.php index e42406c9a..8f107cacc 100644 --- a/src/PartKeepr/CategoryBundle/Action/MoveAction.php +++ b/src/PartKeepr/CategoryBundle/Action/MoveAction.php @@ -54,6 +54,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.category.move" # Controller + /** + * @Route( + * name="StorageLocationCategoryMove", + * path="/storage_location_categories/{id}/move", + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="move"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml index a29ab8ca3..5a4cd57cd 100644 --- a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml +++ b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml @@ -5,9 +5,11 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + + diff --git a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php index 2ed810101..966d7d2ce 100644 --- a/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php +++ b/src/PartKeepr/StorageLocationBundle/Entity/StorageLocationCategory.php @@ -12,28 +12,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.category.move" # Controller -/** -* @Route( -* name="StorageLocationCategoryMove", -* path="/storage_location_categories/{id}/move", -* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="move"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.category.get_root_node" # Controller -/** -* @Route( -* name="StorageLocationCategoryGetRoot", -* path="/storage_location_categories/getExtJSRootNode", -* defaults={"_api_resource_class"=StorageLocationCategory::class, "_api_collection_operation_name"="get_root"} -* ) -* @Method("GET") -**/ - /** * @ApiResource( * attributes={ From 610a332b8ea5ccf29270e77fe489eeb75ba56431 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:41:14 +0200 Subject: [PATCH 071/140] phase 4 - place Route - FoorptintCategory --- .../Action/GetRootNodeAction.php | 10 +++++++++ .../CategoryBundle/Action/MoveAction.php | 10 +++++++++ .../Resources/config/actions.xml | 2 ++ .../Entity/FootprintCategory.php | 22 ------------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php index 91620cc03..c4070b402 100644 --- a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php +++ b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php @@ -46,6 +46,16 @@ public function __construct(ManagerRegistry $manager) * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.category.get_root_node" # Controller + /** + * @Route( + * name="PartKeeprFootprintCategoryGetRootNode", + * path="/footprint_categories/getExtJSRootNode", + * defaults={"_api_resource_class"=FootprintCategory::class, "_api_collection_operation_name"="get_root"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CategoryBundle/Action/MoveAction.php b/src/PartKeepr/CategoryBundle/Action/MoveAction.php index 8f107cacc..fd0746a11 100644 --- a/src/PartKeepr/CategoryBundle/Action/MoveAction.php +++ b/src/PartKeepr/CategoryBundle/Action/MoveAction.php @@ -64,6 +64,16 @@ public function __construct( * ) * @Method("PUT") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.category.move" # Controller + /** + * @Route( + * name="FootprintCategoryMove", + * path="/footprint_categories/{id}/move", + * defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml index 5a4cd57cd..1fa49adf3 100644 --- a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml +++ b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml @@ -5,10 +5,12 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + + diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php index e4998b6a0..505084ef7 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintCategory.php @@ -12,28 +12,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.category.get_root_node" # Controller -/** -* @Route( -* name="PartKeeprFootprintCategoryGetRootNode", -* path="/footprint_categories/getExtJSRootNode", -* defaults={"_api_resource_class"=FootprintCategory::class, "_api_collection_operation_name"="get_root"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.category.move" # Controller -/** -* @Route( -* name="FootprintCategoryMove", -* path="/footprint_categories/{id}/move", -* defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"} -* ) -* @Method("PUT") -**/ - /** * @ApiResource( * attributes={ From e30a742c2e0848c346c601232166c9d5f73a8f4e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:45:58 +0200 Subject: [PATCH 072/140] phase 4 - place Route - PartCategory --- .../Action/GetRootNodeAction.php | 10 +++++++++ .../CategoryBundle/Action/MoveAction.php | 10 +++++++++ .../Resources/config/actions.xml | 2 ++ .../PartBundle/Entity/PartCategory.php | 22 ------------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php index c4070b402..83242999d 100644 --- a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php +++ b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php @@ -56,6 +56,16 @@ public function __construct(ManagerRegistry $manager) * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.category.get_root_node" # Controller + /** + * @Route( + * name="PartKeeprPartCategoryGetRootNode", + * path="/part_categories/getExtJSRootNode", + * defaults={"_api_resource_class"=PartCategory::class, "_api_collection_operation_name"="get_root"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CategoryBundle/Action/MoveAction.php b/src/PartKeepr/CategoryBundle/Action/MoveAction.php index fd0746a11..42622b9d9 100644 --- a/src/PartKeepr/CategoryBundle/Action/MoveAction.php +++ b/src/PartKeepr/CategoryBundle/Action/MoveAction.php @@ -74,6 +74,16 @@ public function __construct( * ) * @Method("PUT") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.category.move" # Controller + /** + * @Route( + * name="PartKeeprPartCategoryMove", + * path="/part_categories/{id}/move", + * defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="move"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml index 1fa49adf3..ec74e0209 100644 --- a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml +++ b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml @@ -5,11 +5,13 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + + diff --git a/src/PartKeepr/PartBundle/Entity/PartCategory.php b/src/PartKeepr/PartBundle/Entity/PartCategory.php index eb5f6c390..75df55e19 100644 --- a/src/PartKeepr/PartBundle/Entity/PartCategory.php +++ b/src/PartKeepr/PartBundle/Entity/PartCategory.php @@ -12,28 +12,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.category.move" # Controller -/** -* @Route( -* name="PartKeeprPartCategoryMove", -* path="/part_categories/{id}/move", -* defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="move"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.category.get_root_node" # Controller -/** -* @Route( -* name="PartKeeprPartCategoryGetRootNode", -* path="/part_categories/getExtJSRootNode", -* defaults={"_api_resource_class"=PartCategory::class, "_api_collection_operation_name"="get_root"} -* ) -* @Method("GET") -**/ - /** * @ApiResource( * attributes={ From aae2567b69733a3a9b6d0acb81fee9e793843d2b Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 18:57:30 +0200 Subject: [PATCH 073/140] phase 4 - place Route - Part --- .../PartBundle/Action/AddStockAction.php | 10 +++ .../PartBundle/Action/GetPartsAction.php | 10 +++ .../PartBundle/Action/PartPostAction.php | 10 +++ .../PartBundle/Action/PartPutAction.php | 10 +++ .../PartBundle/Action/RemoveStockAction.php | 10 +++ .../PartBundle/Action/SetStockAction.php | 10 +++ src/PartKeepr/PartBundle/Entity/Part.php | 66 ------------------- .../PartBundle/Resources/config/actions.xml | 6 ++ 8 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/PartKeepr/PartBundle/Action/AddStockAction.php b/src/PartKeepr/PartBundle/Action/AddStockAction.php index c96521cf5..92f28b0d4 100644 --- a/src/PartKeepr/PartBundle/Action/AddStockAction.php +++ b/src/PartKeepr/PartBundle/Action/AddStockAction.php @@ -54,6 +54,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.part.add_stock" # Controller + /** + * @Route( + * name="PartAddStock", + * path="/parts/{id}/addStock", + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="add_stock"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/PartBundle/Action/GetPartsAction.php b/src/PartKeepr/PartBundle/Action/GetPartsAction.php index 1ce2e00c7..dee86962f 100644 --- a/src/PartKeepr/PartBundle/Action/GetPartsAction.php +++ b/src/PartKeepr/PartBundle/Action/GetPartsAction.php @@ -50,6 +50,16 @@ public function __construct(DataProviderInterface $dataProvider, EntityManager $ * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.parts.collection_get" # Controller + /** + * @Route( + * name="PartsGet", + * path="/parts", + * defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function __invoke(Request $request) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/PartBundle/Action/PartPostAction.php b/src/PartKeepr/PartBundle/Action/PartPostAction.php index f0f52f86e..3d706c81e 100644 --- a/src/PartKeepr/PartBundle/Action/PartPostAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPostAction.php @@ -45,6 +45,16 @@ public function __construct( * * @return mixed */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.part.post" # Controller + /** + * @Route( + * name="PartPost", + * path="/parts", + * defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_post"} + * ) + * @Method("POST") + **/ public function __invoke(Request $request) { if ($this->partService->checkPartLimit()) { diff --git a/src/PartKeepr/PartBundle/Action/PartPutAction.php b/src/PartKeepr/PartBundle/Action/PartPutAction.php index 38399b255..7ff0d4bfd 100644 --- a/src/PartKeepr/PartBundle/Action/PartPutAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPutAction.php @@ -57,6 +57,16 @@ public function __construct( * * @return mixed */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.part.put" # Controller + /** + * @Route( + * name="PartPut", + * path="/parts/{id}", + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_put"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { /** diff --git a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php index bfd725dfd..24f3ad198 100644 --- a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php +++ b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php @@ -54,6 +54,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.part.remove_stock" # Controller + /** + * @Route( + * name="PartRemoveStock", + * path="/parts/{id}/removeStock", + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="remove_stock"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/PartBundle/Action/SetStockAction.php b/src/PartKeepr/PartBundle/Action/SetStockAction.php index 281c3e357..6c043681f 100644 --- a/src/PartKeepr/PartBundle/Action/SetStockAction.php +++ b/src/PartKeepr/PartBundle/Action/SetStockAction.php @@ -54,6 +54,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.part.set_stock" # Controller + /** + * @Route( + * name="PartSetStock", + * path="/parts/{id}/setStock", + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="set_stock"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index ff8f7dc21..41332ca78 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -20,72 +20,6 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.part.post" # Controller -/** -* @Route( -* name="PartPost", -* path="/parts", -* defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_post"} -* ) -* @Method("POST") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.parts.collection_get" # Controller -/** -* @Route( -* name="PartsGet", -* path="/parts", -* defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.part.put" # Controller -/** -* @Route( -* name="PartPut", -* path="/parts/{id}", -* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_put"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.part.add_stock" # Controller -/** -* @Route( -* name="PartAddStock", -* path="/parts/{id}/addStock", -* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="add_stock"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.part.remove_stock" # Controller -/** -* @Route( -* name="PartRemoveStock", -* path="/parts/{id}/removeStock", -* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="remove_stock"} -* ) -* @Method("PUT") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.part.set_stock" # Controller -/** -* @Route( -* name="PartSetStock", -* path="/parts/{id}/setStock", -* defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="set_stock"} -* ) -* @Method("PUT") -**/ - /** * Represents a part in the database. The heart of our project. Handle with care! * diff --git a/src/PartKeepr/PartBundle/Resources/config/actions.xml b/src/PartKeepr/PartBundle/Resources/config/actions.xml index 24ed4ae03..4f79c7dae 100644 --- a/src/PartKeepr/PartBundle/Resources/config/actions.xml +++ b/src/PartKeepr/PartBundle/Resources/config/actions.xml @@ -5,25 +5,30 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + + + + + @@ -34,6 +39,7 @@ + From 000904a1923e8975aa531b45045743e5a17b5e62 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 19:34:54 +0200 Subject: [PATCH 074/140] phase 4 - place Route - PartMeasurementUnit --- .../PartBundle/Action/SetDefaultUnitAction.php | 10 ++++++++++ .../PartBundle/Entity/PartMeasurementUnit.php | 11 ----------- src/PartKeepr/PartBundle/Resources/config/actions.xml | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php index 56034d91b..225a2cdf7 100644 --- a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php +++ b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php @@ -39,6 +39,16 @@ public function __construct(DataProviderInterface $dataProvider, PartMeasurement * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.part_measurement_unit.set_default" # Controller + /** + * @Route( + * name="PartMeasurementUnitSetDefault", + * path="/part_measurement_units/{id}/setDefault", + * defaults={"_api_resource_class"=PartMeasurementUnit::class, "_api_item_operation_name"="custom_put"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php index 5519e0a5b..842a70f5a 100644 --- a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php +++ b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php @@ -11,17 +11,6 @@ use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.part_measurement_unit.set_default" # Controller -/** -* @Route( -* name="PartMeasurementUnitSetDefault", -* path="/part_measurement_units/{id}/setDefault", -* defaults={"_api_resource_class"=PartMeasurementUnit::class, "_api_item_operation_name"="custom_put"} -* ) -* @Method("PUT") -**/ - /** * This entity represents a part measurement unit. Typical measurement units are pieces, centimeters etc. * diff --git a/src/PartKeepr/PartBundle/Resources/config/actions.xml b/src/PartKeepr/PartBundle/Resources/config/actions.xml index 4f79c7dae..0dae731c4 100644 --- a/src/PartKeepr/PartBundle/Resources/config/actions.xml +++ b/src/PartKeepr/PartBundle/Resources/config/actions.xml @@ -34,6 +34,7 @@ + From 2b942053ed17b8d57c1ca5fecb534b16833ded45 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 19:41:25 +0200 Subject: [PATCH 075/140] phase 4 - place Route - ManufacturerICLogo --- .../ImageBundle/Controller/ImageController.php | 10 ++++++++++ .../ManufacturerBundle/Entity/ManufacturerICLogo.php | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index ed11254c9..0768e81da 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -61,6 +61,16 @@ abstract class ImageController extends FileController * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprManufacturerBundle:ManufacturerIcLogo:getImage" # Controller + /** + * @Route( + * name="ManufacturerIcLogoGetImage", + * path="/manufacturer_i_c_logos/{id}/getImage", + * defaults={"_api_resource_class"=ManufacturerICLogo::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getImageAction(Request $request, $id) { /** diff --git a/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php b/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php index 7fac06269..4605be1b8 100644 --- a/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php +++ b/src/PartKeepr/ManufacturerBundle/Entity/ManufacturerICLogo.php @@ -7,17 +7,6 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprManufacturerBundle:ManufacturerIcLogo:getImage" # Controller -/** -* @Route( -* name="ManufacturerIcLogoGetImage", -* path="/manufacturer_i_c_logos/{id}/getImage", -* defaults={"_api_resource_class"=ManufacturerICLogo::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - /** * Holds a manufacturer IC logo. * From f0583ffbf06b6e6a152d5fd26ce9dfcb2d7a7fbe Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 19:53:06 +0200 Subject: [PATCH 076/140] phase 4 - place Route - PartAttachment --- .../Controller/ImageController.php | 10 ++++++ .../PartBundle/Entity/PartAttachment.php | 33 ------------------- .../Controller/FileController.php | 20 +++++++++++ 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index 0768e81da..02420adbe 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -71,6 +71,16 @@ abstract class ImageController extends FileController * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprPartBundle:PartAttachment:getImage" # Controller + /** + * @Route( + * name="PartAttachmentGetImage", + * path="/part_attachments/{id}/getImage", + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_image"} + * ) + * @Method("GET") + **/ public function getImageAction(Request $request, $id) { /** diff --git a/src/PartKeepr/PartBundle/Entity/PartAttachment.php b/src/PartKeepr/PartBundle/Entity/PartAttachment.php index 6f5821ff1..42eec3e14 100644 --- a/src/PartKeepr/PartBundle/Entity/PartAttachment.php +++ b/src/PartKeepr/PartBundle/Entity/PartAttachment.php @@ -8,39 +8,6 @@ use PartKeepr\UploadedFileBundle\Entity\UploadedFile; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprPartBundle:PartAttachment:getImage" # Controller -/** -* @Route( -* name="PartAttachmentGetImage", -* path="/part_attachments/{id}/getImage", -* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_image"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprPartBundle:PartAttachment:getFile" # Controller -/** -* @Route( -* name="PartAttachmentGet", -* path="/part_attachments/{id}/getFile", -* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprPartBundle:PartAttachment:getMimeTypeIcon" # Controller -/** -* @Route( -* name="PartAttachmentMimeTypeIcon", -* path="/part_attachments/{id}/getMimeTypeIcon", -* defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_mime"} -* ) -* @Method("GET") -**/ - /** * Holds a part attachment. * diff --git a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php index f27513887..fdd32d28f 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php @@ -37,6 +37,16 @@ abstract class FileController extends Controller * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprPartBundle:PartAttachment:getMimeTypeIcon" # Controller + /** + * @Route( + * name="PartAttachmentMimeTypeIcon", + * path="/part_attachments/{id}/getMimeTypeIcon", + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_mime"} + * ) + * @Method("GET") + **/ public function getMimeTypeIconAction($id) { /** @@ -81,6 +91,16 @@ public function getMimeTypeIconAction($id) * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprPartBundle:PartAttachment:getFile" # Controller + /** + * @Route( + * name="PartAttachmentGet", + * path="/part_attachments/{id}/getFile", + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getFileAction($id) { /** From 8a0f253f2a0843795def91164faa89af7a697ea5 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 19:59:20 +0200 Subject: [PATCH 077/140] phase 4 - place Route - GridPreset --- .../FrontendBundle/Action/MarkAsDefaultAction.php | 10 ++++++++++ src/PartKeepr/FrontendBundle/Entity/GridPreset.php | 11 ----------- .../FrontendBundle/Resources/config/actions.xml | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php index 14606fbe4..0cddfcb6d 100644 --- a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php +++ b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php @@ -41,6 +41,16 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.grid_preset.mark_as_default" # Controller + /** + * @Route( + * name="MarkGridPresetAsDefault", + * path="/grid_presets/{id}/markAsDefault", + * defaults={"_api_resource_class"=GridPreset::class, "_api_item_operation_name"="markAsDefault"} + * ) + * @Method("PUT") + **/ public function __invoke(Request $request, $id) { list($resourceType) = $this->extractAttributes($request); diff --git a/src/PartKeepr/FrontendBundle/Entity/GridPreset.php b/src/PartKeepr/FrontendBundle/Entity/GridPreset.php index d8cf0fe97..4d31a9389 100644 --- a/src/PartKeepr/FrontendBundle/Entity/GridPreset.php +++ b/src/PartKeepr/FrontendBundle/Entity/GridPreset.php @@ -9,17 +9,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -// ToDo: fix this - move this Route annotation to the correct place -// "partkeepr.grid_preset.mark_as_default" # Controller -/** -* @Route( -* name="MarkGridPresetAsDefault", -* path="/grid_presets/{id}/markAsDefault", -* defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"} -* ) -* @Method("PUT") -**/ - /** * Stores the grid presets. * diff --git a/src/PartKeepr/FrontendBundle/Resources/config/actions.xml b/src/PartKeepr/FrontendBundle/Resources/config/actions.xml index 37f960f77..3b079adac 100644 --- a/src/PartKeepr/FrontendBundle/Resources/config/actions.xml +++ b/src/PartKeepr/FrontendBundle/Resources/config/actions.xml @@ -5,6 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + From 1b712b201c10e65ed1fbe65a0977fe08238b7ea2 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 20:05:10 +0200 Subject: [PATCH 078/140] phase 4 - place Route - FootprintAttachment --- .../Entity/FootprintAttachment.php | 24 ------------------- .../Controller/FileController.php | 20 ++++++++++++++++ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php index 6ca3cb4b8..f30142e15 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintAttachment.php @@ -7,30 +7,6 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprFootprintBundle:FootprintAttachment:getFile" # Controller - -/** -* @Route( -* name="FootprintAttachmentGet", -* path="/footprint_attachments/{id}/getFile", -* defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} -* ) -* @Method("GET") -**/ - -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprFootprintBundle:FootprintAttachment:getMimeTypeIcon" # Controller - -/** -* @Route( -* name="FootprintAttachmentMimeTypeIcon", -* path="/footprint_attachments/{id}/getMimeTypeIcon", -* defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get_mime"} -* ) -* @Method("GET") -**/ - /** * Holds a footprint attachment. * diff --git a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php index fdd32d28f..6a16311f0 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php @@ -47,6 +47,16 @@ abstract class FileController extends Controller * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprFootprintBundle:FootprintAttachment:getMimeTypeIcon" # Controller + /** + * @Route( + * name="FootprintAttachmentMimeTypeIcon", + * path="/footprint_attachments/{id}/getMimeTypeIcon", + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get_mime"} + * ) + * @Method("GET") + **/ public function getMimeTypeIconAction($id) { /** @@ -101,6 +111,16 @@ public function getMimeTypeIconAction($id) * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprFootprintBundle:FootprintAttachment:getFile" # Controller + /** + * @Route( + * name="FootprintAttachmentGet", + * path="/footprint_attachments/{id}/getFile", + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + **/ public function getFileAction($id) { /** From 252576c2116174106e89ca8306b9b8b2c53adb05 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 20:07:51 +0200 Subject: [PATCH 079/140] phase 4 - place Route - FootprintImage --- .../FootprintBundle/Entity/FootprintImage.php | 11 ----------- .../ImageBundle/Controller/ImageController.php | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php index 49377ccaa..c3812cda2 100644 --- a/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php +++ b/src/PartKeepr/FootprintBundle/Entity/FootprintImage.php @@ -7,17 +7,6 @@ use Symfony\Component\Validator\Constraints as Assert; use PartKeepr\ImageBundle\Entity\Image; -// ToDo: fix this - move this Route annotation to the correct place -// "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller -/** - * @Route( - * name="FootprintImageGetImage", - * path="/footprint_images/{id}/getImage", - * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} - * ) - * @Method("GET") - */ - /** * Holds a footprint image. * diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index 02420adbe..68167ac64 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -81,6 +81,16 @@ abstract class ImageController extends FileController * ) * @Method("GET") **/ + // ToDo: fix this - move this Route annotation to the correct place + // "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller + /** + * @Route( + * name="FootprintImageGetImage", + * path="/footprint_images/{id}/getImage", + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} + * ) + * @Method("GET") + */ public function getImageAction(Request $request, $id) { /** From ff8cf1560d3ed1eb3788a0fc35323af5987675eb Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 20:15:45 +0200 Subject: [PATCH 080/140] phase 4 - place Route - BatchJob --- src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php | 3 ++- src/PartKeepr/BatchJobBundle/Resources/config/actions.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php index eab8f4154..813bf598b 100644 --- a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php +++ b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php @@ -68,7 +68,8 @@ public function __construct( * * @return array|\Dunglas\ApiBundle\Model\PaginatorInterface|\Traversable */ - // ToDo:I'm not sure about the class to declare for "_api_resource_class"=BatchJob::class or ExecuteBatchJobAction::class + // ToDo: fix this - move this Route annotation to the correct place + // "partkeepr.batchjob.execute" # Controller /** * @Route( * name="BatchJobExecute", diff --git a/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml b/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml index ecd11c19d..0ebb36e08 100644 --- a/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml +++ b/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml @@ -3,8 +3,8 @@ - + From 112dc51f8d0581df7ad929ce79b531da10913031 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 20:45:24 +0200 Subject: [PATCH 081/140] fix some path errors in composer json lock --- composer.json | 4 ++-- composer.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index a995143f6..1d46c9804 100755 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/escapestudiosEscapeWSSEAuthenticationBundle" + "url": "https://github.com/djoos/EscapeWSSEAuthenticationBundle" }, { "type": "vcs", @@ -31,7 +31,7 @@ }, { "type": "vcs", - "url": "https://github.com/Maks3wFR3DLdapBundle" + "url": "https://github.com/Maks3w/FR3DLdapBundle" }, { "type": "vcs", diff --git a/composer.lock b/composer.lock index 5328498be..c2cb02c14 100644 --- a/composer.lock +++ b/composer.lock @@ -1581,7 +1581,7 @@ "target-dir": "Escape/WSSEAuthenticationBundle", "source": { "type": "git", - "url": "https://github.com/escapestudios/EscapeWSSEAuthenticationBundle", + "url": "https://github.com/djoos/EscapeWSSEAuthenticationBundle", "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22" }, "dist": { @@ -1620,18 +1620,18 @@ }, { "name": "Community contributors", - "homepage": "https://github.com/escapestudios/EscapeWSSEAuthenticationBundle/graphs/contributors" + "homepage": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/graphs/contributors" } ], "description": "Symfony2 bundle to implement WSSE authentication", - "homepage": "https://github.com/escapestudios/EscapeWSSEAuthenticationBundle", + "homepage": "https://github.com/djoos/EscapeWSSEAuthenticationBundle", "keywords": [ "authentication", "bundle", "wsse" ], "support": { - "source": "https://github.com/Drachenkaetzchen/EscapeWSSEAuthenticationBundle/tree/PSR3Logging" + "source": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/tree/PSR3Logging" }, "time": "2016-01-03T15:44:13+00:00" }, From ab4a1fc55ee38b227b5f1f0359f77e7da084de7a Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 13 May 2021 21:33:16 +0200 Subject: [PATCH 082/140] composer, updated some Symfonys to 3.4.x -lock is not manual! this time --- composer.json | 11 +- composer.lock | 1819 ++++++++++++++++++++++++++----------------------- 2 files changed, 981 insertions(+), 849 deletions(-) diff --git a/composer.json b/composer.json index 1d46c9804..441be289e 100755 --- a/composer.json +++ b/composer.json @@ -64,14 +64,15 @@ "snc/redis-bundle": "2.1.13", "stof/doctrine-extensions-bundle": "v1.3.0", "symfony/assetic-bundle": "v2.8.2", - "symfony/monolog-bundle": "v3.3.1", - "symfony/property-access": "v2.8.52", - "symfony/swiftmailer-bundle": "v3.0.3", - "symfony/symfony": "v3.3.1", + "symfony/monolog-bundle": "v3.4.0", + "symfony/property-access": "v3.4.10", + "symfony/cache": "v3.4.10", + "symfony/swiftmailer-bundle": "v3.4.0", + "symfony/symfony": "v3.4.10", "twig/extensions": "v1.5.4", "twig/twig": "v1.42.2", - "api-platform/core": "dev-main#63c880f975435c3cb04512f1d6367a17dad9ff0d", + "api-platform/core": "dev-main", "escapestudios/wsse-authentication-bundle": "2.3.0", "fr3d/ldap-bundle": "v3.0.2", "nfq-alpha/sprite-bundle": "dev-min-image-fix", diff --git a/composer.lock b/composer.lock index c2cb02c14..c5293ce68 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,102 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "005da634ba3ea4356b95323be5a97d37", + "content-hash": "2ab5b65a8acba78137a99b94a504d80a", "packages": [ + { + "name": "api-platform/core", + "version": "dev-main", + "source": { + "type": "git", + "url": "https://github.com/api-platform/core.git", + "reference": "63c880f975435c3cb04512f1d6367a17dad9ff0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/api-platform/core/zipball/63c880f975435c3cb04512f1d6367a17dad9ff0d", + "reference": "63c880f975435c3cb04512f1d6367a17dad9ff0d", + "shasum": "" + }, + "require": { + "doctrine/inflector": "^1.0", + "php": ">=7.0", + "psr/cache": "^1.0", + "symfony/http-foundation": "^2.7 || ^3.0", + "symfony/http-kernel": "^2.7 || ^3.0", + "symfony/serializer": "^3.1", + "willdurand/negotiation": "^2.0.3" + }, + "require-dev": { + "behat/behat": "^3.1", + "behat/mink": "^1.7", + "behat/mink-browserkit-driver": "^1.3.1", + "behat/mink-extension": "^2.2", + "behat/symfony2-extension": "^2.1", + "behatch/contexts": "^2.5", + "doctrine/annotations": "^1.2", + "doctrine/doctrine-bundle": "^1.6.3", + "doctrine/orm": "^2.5", + "friendsofsymfony/user-bundle": "^2.0@dev", + "nelmio/api-doc-bundle": "^2.11.2", + "php-mock/php-mock-phpunit": "^1.1", + "phpdocumentor/reflection-docblock": "^3.0", + "phpdocumentor/type-resolver": "^0.2", + "phpunit/phpunit": "^5.6.8", + "psr/log": "^1.0", + "symfony/asset": "^2.7 || ^3.0", + "symfony/cache": "^3.1", + "symfony/config": "^2.7 || ^3.0", + "symfony/dependency-injection": "^2.7 || ^3.0", + "symfony/doctrine-bridge": "^2.8 || ^3.0", + "symfony/finder": "^2.7 || ^3.0", + "symfony/framework-bundle": "^3.1", + "symfony/phpunit-bridge": "^2.7 || ^3.0", + "symfony/security": "^2.7 || ^3.0", + "symfony/templating": "^2.7 || ^3.0", + "symfony/twig-bundle": "^2.8 || ^3.1", + "symfony/validator": "^2.7 || ^3.0" + }, + "suggest": { + "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.", + "phpdocumentor/reflection-docblock": "To support extracting metadata from PHPDoc.", + "psr/cache-implementation": "To use metadata caching.", + "symfony/cache": "To have metadata caching when using Symfony integration.", + "symfony/config": "To load XML configuration files.", + "symfony/twig-bundle": "To use the Swagger UI integration." + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "ApiPlatform\\Core\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com", + "homepage": "http://dunglas.fr" + } + ], + "description": "JSON-LD / Hydra REST API for Symfony", + "homepage": "http://api-platform.com", + "keywords": [ + "Hydra", + "JSON-LD", + "api", + "json", + "rest" + ], + "time": "2016-12-02T13:50:49+00:00" + }, { "name": "atelierspierrot/famfamfam-silk-sprite", "version": "v1.0.0", @@ -1320,333 +1414,141 @@ "time": "2017-12-17T02:57:51+00:00" }, { - "name": "psr/cache", - "version": "1.0.1", + "name": "egulias/email-validator", + "version": "2.1.25", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4", + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4", "shasum": "" }, "require": { - "willdurand/negotiation": "^2.0.3" + "doctrine/lexer": "^1.0.1", + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.10" }, "require-dev": { - "psr/log": "^1.0" + "dominicsayers/isemail": "^3.0.7", + "phpunit/phpunit": "^4.8.36|^7.5.15", + "satooshi/php-coveralls": "^1.0.1" }, - "type": "psr/cache", + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { - "psr-4": { "ApiPlatform\\Core\\": "src/" } + "psr-4": { + "Egulias\\EmailValidator\\": "src" + } }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "authors": [ { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com", - "homepage": "http://dunglas.fr" + "name": "Eduardo Gulias Davis" } ], - "description": "JSON-LD / Hydra REST API for Symfony", - "homepage": "http://api-platform.com", + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", "keywords": [ - "rest" + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" ], - "time": "2015-09-23T13:09:28+00:00" + "funding": [ + { + "url": "https://github.com/egulias", + "type": "github" + } + ], + "time": "2020-12-29T14:50:06+00:00" }, { - "name": "api-platform/core", - "version": "dev-main#63c880f975435c3cb04512f1d6367a17dad9ff0d", + "name": "escapestudios/wsse-authentication-bundle", + "version": "2.3.0", + "target-dir": "Escape/WSSEAuthenticationBundle", "source": { "type": "git", - "url": "https://github.com/api-platform/core.git", - "reference": "63c880f975435c3cb04512f1d6367a17dad9ff0d" + "url": "https://github.com/djoos/EscapeWSSEAuthenticationBundle.git", + "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/63c880f975435c3cb04512f1d6367a17dad9ff0d", - "reference": "63c880f975435c3cb04512f1d6367a17dad9ff0d", + "url": "https://api.github.com/repos/djoos/EscapeWSSEAuthenticationBundle/zipball/fe5585f20570c89a3e6f9b889104c1263a734a22", + "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22", "shasum": "" }, "require": { - "php": ">=7.0", - "doctrine/inflector": "^1.0", - "psr/cache": "^1.0", - "symfony/http-foundation": "^2.7 || ^3.0", - "symfony/http-kernel": "^2.7 || ^3.0", - "symfony/serializer": "^3.1", - "willdurand/negotiation": "^2.0.3" + "doctrine/common": "~2.2", + "php": ">=5.3.2", + "symfony/framework-bundle": "~3.3", + "symfony/security-bundle": "~3.3" }, "require-dev": { - "behat/behat": "^3.1", - "behat/mink": "^1.7", - "behat/mink-browserkit-driver": "^1.3.1", - "behat/mink-extension": "^2.2", - "behat/symfony2-extension": "^2.1", - "behatch/contexts": "^2.5", - "doctrine/doctrine-bundle": "^1.6.3", - "doctrine/orm": "^2.5", - "doctrine/annotations": "^1.2", - "friendsofsymfony/user-bundle": "^2.0@dev", - "nelmio/api-doc-bundle": "^2.11.2", - "php-mock/php-mock-phpunit": "^1.1", - "phpdocumentor/reflection-docblock": "^3.0", - "phpdocumentor/type-resolver": "^0.2", - "phpunit/phpunit": "^5.6.8", - "psr/log": "^1.0", - "symfony/asset": "^2.7 || ^3.0", - "symfony/cache": "^3.1", - "symfony/config": "^2.7 || ^3.0", - "symfony/dependency-injection": "^2.7 || ^3.0", - "symfony/doctrine-bridge": "^2.8 || ^3.0", - "symfony/phpunit-bridge": "^2.7 || ^3.0", - "symfony/security": "^2.7 || ^3.0", - "symfony/templating": "^2.7 || ^3.0", - "symfony/validator": "^2.7 || ^3.0", - "symfony/finder": "^2.7 || ^3.0", - "symfony/framework-bundle": "^3.1", - "symfony/twig-bundle": "^2.8 || ^3.1" - }, - "suggest": { - "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.", - "phpdocumentor/reflection-docblock": "To support extracting metadata from PHPDoc.", - "psr/cache-implementation": "To use metadata caching.", - "symfony/cache": "To have metadata caching when using Symfony integration.", - "symfony/config": "To load XML configuration files.", - "symfony/twig-bundle": "To use the Swagger UI integration." + "symfony/finder": "~3.3" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { - "psr-4": { "ApiPlatform\\Core\\": "src/" } + "psr-0": { + "Escape\\WSSEAuthenticationBundle": "" + } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com", - "homepage": "http://dunglas.fr" + "name": "David Joos", + "email": "david@escapestudios.com" + }, + { + "name": "Community contributors", + "homepage": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/graphs/contributors" } ], - "description": "JSON-LD / Hydra REST API for Symfony", - "homepage": "http://api-platform.com", + "description": "Symfony2 bundle to implement WSSE authentication", + "homepage": "https://github.com/djoos/EscapeWSSEAuthenticationBundle", "keywords": [ - "Hydra", - "JSON-LD", - "api", - "json", - "rest" + "authentication", + "bundle", + "wsse" ], - "abandoned": "api-platform/api-pack", - "time": "2015-09-23T13:09:28+00:00" + "support": { + "source": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/tree/PSR3Logging" + }, + "time": "2016-01-03T15:44:13+00:00" }, { - "name": "dunglas/php-property-info", - "version": "v0.2.3", + "name": "fortawesome/font-awesome", + "version": "5.15.1", "source": { "type": "git", - "url": "https://github.com/dunglas/php-property-info.git", - "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a" + "url": "https://github.com/FortAwesome/Font-Awesome.git", + "reference": "57005cea6da7d1c67f3466974aecd25485f60452" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dunglas/php-property-info/zipball/698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", - "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", - "shasum": "" - }, - "require": { - "php": ">=5.4" - }, - "require-dev": { - "doctrine/orm": "~2.3", - "phpdocumentor/reflection": "~1.0", - "phpspec/phpspec": "~2.1" - }, - "suggest": { - "doctrine/orm": "To use Doctrine metadata", - "phpdocumentor/reflection": "To use the PHPDoc", - "symfony/validator": "To use Symfony validator metadata" - }, - "type": "library", - "autoload": { - "psr-0": { - "PropertyInfo\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com" - } - ], - "description": "Retrieve type and description of PHP properties using various sources ", - "homepage": "http://dunglas.fr", - "keywords": [ - "doctrine", - "phpdoc", - "property", - "symfony", - "type", - "validator" - ], - "abandoned": "symfony/property-info", - "time": "2015-12-29T08:21:00+00:00" - }, - { - "name": "egulias/email-validator", - "version": "2.1.25", - "source": { - "type": "git", - "url": "https://github.com/egulias/EmailValidator.git", - "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4", - "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^1.0.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.10" - }, - "require-dev": { - "dominicsayers/isemail": "^3.0.7", - "phpunit/phpunit": "^4.8.36|^7.5.15", - "satooshi/php-coveralls": "^1.0.1" - }, - "suggest": { - "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Egulias\\EmailValidator\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eduardo Gulias Davis" - } - ], - "description": "A library for validating emails against several RFCs", - "homepage": "https://github.com/egulias/EmailValidator", - "keywords": [ - "email", - "emailvalidation", - "emailvalidator", - "validation", - "validator" - ], - "funding": [ - { - "url": "https://github.com/egulias", - "type": "github" - } - ], - "time": "2020-12-29T14:50:06+00:00" - }, - { - "name": "escapestudios/wsse-authentication-bundle", - "version": "2.3.0", - "target-dir": "Escape/WSSEAuthenticationBundle", - "source": { - "type": "git", - "url": "https://github.com/djoos/EscapeWSSEAuthenticationBundle", - "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/djoos/EscapeWSSEAuthenticationBundle/zipball/fe5585f20570c89a3e6f9b889104c1263a734a22", - "reference": "fe5585f20570c89a3e6f9b889104c1263a734a22", - "shasum": "" - }, - "require": { - "doctrine/common": "~2.2", - "php": ">=5.3.2", - "symfony/framework-bundle": "~3.3", - "symfony/security-bundle": "~3.3" - }, - "require-dev": { - "symfony/finder": "~3.3" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-0": { - "Escape\\WSSEAuthenticationBundle": "" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "David Joos", - "email": "david@escapestudios.com" - }, - { - "name": "Community contributors", - "homepage": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/graphs/contributors" - } - ], - "description": "Symfony2 bundle to implement WSSE authentication", - "homepage": "https://github.com/djoos/EscapeWSSEAuthenticationBundle", - "keywords": [ - "authentication", - "bundle", - "wsse" - ], - "support": { - "source": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/tree/PSR3Logging" - }, - "time": "2016-01-03T15:44:13+00:00" - }, - { - "name": "fortawesome/font-awesome", - "version": "5.15.1", - "source": { - "type": "git", - "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "57005cea6da7d1c67f3466974aecd25485f60452" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/57005cea6da7d1c67f3466974aecd25485f60452", - "reference": "57005cea6da7d1c67f3466974aecd25485f60452", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/57005cea6da7d1c67f3466974aecd25485f60452", + "reference": "57005cea6da7d1c67f3466974aecd25485f60452", "shasum": "" }, "type": "library", @@ -1703,7 +1605,7 @@ "version": "v3.0.2", "source": { "type": "git", - "url": "https://github.com/Maks3w/FR3DLdapBundle", + "url": "https://github.com/Maks3w/FR3DLdapBundle.git", "reference": "2309156974e02a8a1398fe491627e1a84da39e67" }, "dist": { @@ -1712,23 +1614,23 @@ "reference": "2309156974e02a8a1398fe491627e1a84da39e67", "shasum": "" }, - "require" : { - "php" : ">=5.5", - "psr/log" : "~1.0", - "symfony/config" : "2.3 - 3", - "symfony/dependency-injection" : "2.3 - 3", - "symfony/polyfill-php56" : "^1.1", - "symfony/security" : "2.3 - 3", - "symfony/security-bundle" : "2.3 - 3", - "zendframework/zend-ldap" : "2.5 - 3" - }, - "require-dev" : { - "fabpot/php-cs-fixer" : "1.11.*", - "fr3d/psr3-message-assertions" : "0.1.*", - "friendsofsymfony/user-bundle" : "~1.3", - "maks3w/phpunit-methods-trait" : "^4.6", - "phpunit/phpunit" : "^4.6", - "symfony/validator" : "2.3 - 3" + "require": { + "php": ">=5.5", + "psr/log": "~1.0", + "symfony/config": "2.3 - 3", + "symfony/dependency-injection": "2.3 - 3", + "symfony/polyfill-php56": "^1.1", + "symfony/security": "2.3 - 3", + "symfony/security-bundle": "2.3 - 3", + "zendframework/zend-ldap": "2.5 - 3" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.11.*", + "fr3d/psr3-message-assertions": "0.1.*", + "friendsofsymfony/user-bundle": "~1.3", + "maks3w/phpunit-methods-trait": "^4.6", + "phpunit/phpunit": "^4.6", + "symfony/validator": "2.3 - 3" }, "suggest": { "friendsofsymfony/user-bundle": "Integrate authentication and management for DB users, useful for unmanaged LDAP servers", @@ -1776,35 +1678,35 @@ "shasum": "" }, "require": { - "php": "^5.5.9|~7.0", - "psr/log": "^1.0", - "symfony/framework-bundle": "^2.7|^3.0", - "symfony/finder": "^2.7|^3.0", - "symfony/routing": "^2.7|^3.0", - "doctrine/inflector": "^1.0", - "willdurand/negotiation": "^2.0", - "willdurand/jsonp-callback-validator": "^1.0" + "doctrine/inflector": "^1.0", + "php": "^5.5.9|~7.0", + "psr/log": "^1.0", + "symfony/finder": "^2.7|^3.0", + "symfony/framework-bundle": "^2.7|^3.0", + "symfony/routing": "^2.7|^3.0", + "willdurand/jsonp-callback-validator": "^1.0", + "willdurand/negotiation": "^2.0" }, "conflict": { - "sensio/framework-extra-bundle": "<3.0.13", - "jms/serializer": "1.3.0" + "jms/serializer": "1.3.0", + "sensio/framework-extra-bundle": "<3.0.13" }, "require-dev": { - "sensio/framework-extra-bundle": "^3.0.13", - "symfony/phpunit-bridge": "~2.7|^3.0", - "symfony/form": "^2.7|^3.0", - "symfony/validator": "^2.7|^3.0", - "symfony/serializer": "^2.7.11|^3.0.4", - "symfony/yaml": "^2.7|^3.0", - "symfony/security-bundle": "^2.7|^3.0", - "symfony/web-profiler-bundle": "^2.7|^3.0", - "symfony/twig-bundle": "^2.7|^3.0", - "symfony/browser-kit": "^2.7|^3.0", - "symfony/dependency-injection": "^2.7|^3.0", - "symfony/expression-language": "~2.7|^3.0", - "symfony/css-selector": "^2.7|^3.0", - "phpoption/phpoption": "^1.1", - "jms/serializer-bundle": "^1.0" + "jms/serializer-bundle": "^1.0", + "phpoption/phpoption": "^1.1", + "sensio/framework-extra-bundle": "^3.0.13", + "symfony/browser-kit": "^2.7|^3.0", + "symfony/css-selector": "^2.7|^3.0", + "symfony/dependency-injection": "^2.7|^3.0", + "symfony/expression-language": "~2.7|^3.0", + "symfony/form": "^2.7|^3.0", + "symfony/phpunit-bridge": "~2.7|^3.0", + "symfony/security-bundle": "^2.7|^3.0", + "symfony/serializer": "^2.7.11|^3.0.4", + "symfony/twig-bundle": "^2.7|^3.0", + "symfony/validator": "^2.7|^3.0", + "symfony/web-profiler-bundle": "^2.7|^3.0", + "symfony/yaml": "^2.7|^3.0" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0", @@ -2708,7 +2610,7 @@ "michelf/php-markdown": "~1.4", "symfony/console": "~2.3|~3.0|~4.0", "symfony/framework-bundle": "~2.3|~3.0|~4.0", - "symfony/twig-bundle": "~2.3|~3.0|~4.0" + "symfony/twig-bundle": "~2.3|~3.0|~4.0" }, "conflict": { "jms/serializer": "<0.12", @@ -2813,190 +2715,83 @@ "time": "2016-08-01T15:59:08+00:00" }, { - "name": "nikic/php-parser", - "version": "v0.9.4", + "name": "paragonie/random_compat", + "version": "v2.0.19", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f" + "url": "https://github.com/paragonie/random_compat.git", + "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1e5e280ae88a27effa2ae4aa2bd088494ed8594f", - "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241", + "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241", "shasum": "" }, "require": { - "php": ">=5.2" + "php": ">=5.2.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.9-dev" - } + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, + "type": "library", "autoload": { - "psr-0": { - "PHPParser": "lib/" - } + "files": [ + "lib/random.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Nikita Popov" + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" } ], - "description": "A PHP parser written in PHP", + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ - "parser", - "php" + "csprng", + "polyfill", + "pseudorandom", + "random" ], - "time": "2013-08-25T17:11:40+00:00" + "time": "2020-10-15T10:06:57+00:00" }, { - "name": "ocramius/proxy-manager", - "version": "1.0.2", + "name": "partkeepr/extjs6", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11" + "url": "https://github.com/partkeepr/extjs6.git", + "reference": "e65af313cf71633e76b310b0a9981494b2dd392b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/57e9272ec0e8deccf09421596e0e2252df440e11", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11", + "url": "https://api.github.com/repos/partkeepr/extjs6/zipball/e65af313cf71633e76b310b0a9981494b2dd392b", + "reference": "e65af313cf71633e76b310b0a9981494b2dd392b", "shasum": "" }, "require": { - "php": ">=5.3.3", - "zendframework/zend-code": ">2.2.5,<3.0" + "composer/installers": "~1.0" }, - "require-dev": { - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "1.5.*" - }, - "suggest": { - "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", - "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", - "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", - "zendframework/zend-stdlib": "To use the hydrator proxy", - "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "ProxyManager\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", - "homepage": "https://github.com/Ocramius/ProxyManager", - "keywords": [ - "aop", - "lazy loading", - "proxy", - "proxy pattern", - "service proxies" - ], - "time": "2015-08-09T04:28:19+00:00" - }, - { - "name": "paragonie/random_compat", - "version": "v2.0.19", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241", - "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241", - "shasum": "" - }, - "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" - ], - "time": "2020-10-15T10:06:57+00:00" - }, - { - "name": "partkeepr/extjs6", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/partkeepr/extjs6.git", - "reference": "e65af313cf71633e76b310b0a9981494b2dd392b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/partkeepr/extjs6/zipball/e65af313cf71633e76b310b0a9981494b2dd392b", - "reference": "e65af313cf71633e76b310b0a9981494b2dd392b", - "shasum": "" - }, - "require": { - "composer/installers": "~1.0" - }, - "type": "zend-extra", - "license": [ - "GPLv3" - ], - "description": "ExtJS 6.0.0.640 distro", - "keywords": [ - "PartKeepr", - "extjs6" - ], - "support": { - "source": "https://github.com/partkeepr/extjs6/tree/master", - "issues": "https://github.com/partkeepr/extjs6/issues" + "type": "zend-extra", + "license": [ + "GPLv3" + ], + "description": "ExtJS 6.0.0.640 distro", + "keywords": [ + "PartKeepr", + "extjs6" + ], + "support": { + "source": "https://github.com/partkeepr/extjs6/tree/master", + "issues": "https://github.com/partkeepr/extjs6/issues" }, "time": "2017-01-10T21:51:17+00:00" }, @@ -3051,109 +2846,6 @@ ], "time": "2015-09-30T13:47:50+00:00" }, - { - "name": "phpdocumentor/reflection", - "version": "1.0.7", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/Reflection.git", - "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/fc40c3f604ac2287eb5c314174d5109b2c699372", - "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372", - "shasum": "" - }, - "require": { - "nikic/php-parser": "~0.9.4", - "php": ">=5.3.3", - "phpdocumentor/reflection-docblock": "~2.0", - "psr/log": "~1.0" - }, - "require-dev": { - "behat/behat": "~2.4", - "mockery/mockery": "~0.8", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/", - "tests/unit/", - "tests/mocks/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Reflection library to do Static Analysis for PHP Projects", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2014-11-14T11:43:04+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "2.0.5", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", - "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" - } - ], - "time": "2016-01-25T08:17:30+00:00" - }, { "name": "phpseclib/phpseclib", "version": "2.0.30", @@ -3335,45 +3027,90 @@ "time": "2020-09-11T19:18:05+00:00" }, { - "name": "psr/container", - "version": "1.0.0", + "name": "psr/cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { - "php": ">=5.3.0" + "willdurand/negotiation": "^2.0.3" }, - "type": "library", + "require-dev": { + "psr/log": "^1.0" + }, + "type": "psr/cache", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" } }, "autoload": { "psr-4": { - "Psr\\Container\\": "src/" + "ApiPlatform\\Core\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com", + "homepage": "http://dunglas.fr" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "JSON-LD / Hydra REST API for Symfony", + "homepage": "http://api-platform.com", + "keywords": [ + "rest" + ], + "time": "2015-09-23T13:09:28+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ "PSR-11", "container", @@ -3471,6 +3208,54 @@ ], "time": "2012-12-21T11:40:51+00:00" }, + { + "name": "psr/simple-cache", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "5a7b96b1dda5d957e01bc1bfe77dcca09c5a7474" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/5a7b96b1dda5d957e01bc1bfe77dcca09c5a7474", + "reference": "5a7b96b1dda5d957e01bc1bfe77dcca09c5a7474", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2020-04-21T06:43:17+00:00" + }, { "name": "ralouphie/getallheaders", "version": "3.0.3", @@ -3654,13 +3439,13 @@ }, "require": { "php": ">=5.3.9", - "symfony/dependency-injection": "~2.3|~3.0", + "sensiolabs/security-checker": "~5.0|~6.0", + "symfony/class-loader": "~2.3|~3.0", "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", "symfony/filesystem": "~2.3|~3.0", "symfony/http-kernel": "~2.3|~3.0", - "symfony/class-loader": "~2.3|~3.0", - "symfony/process": "~2.3|~3.0", - "sensiolabs/security-checker": "~5.0|~6.0" + "symfony/process": "~2.3|~3.0" }, "suggest": { "symfony/form": "If you want to use the configurator", @@ -3674,7 +3459,9 @@ } }, "autoload": { - "psr-4": { "Sensio\\Bundle\\DistributionBundle\\": "" } + "psr-4": { + "Sensio\\Bundle\\DistributionBundle\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3810,6 +3597,7 @@ } ], "description": "A security checker for your composer.lock", + "abandoned": "https://github.com/fabpot/local-php-security-checker", "time": "2019-11-01T13:20:14+00:00" }, { @@ -4154,6 +3942,76 @@ "abandoned": "symfony/webpack-encore-pack", "time": "2017-07-14T07:26:46+00:00" }, + { + "name": "symfony/cache", + "version": "v3.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache.git", + "reference": "b6f157d4529a3484f60ebc40661b5232526fb432" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache/zipball/b6f157d4529a3484f60ebc40661b5232526fb432", + "reference": "b6f157d4529a3484f60ebc40661b5232526fb432", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "psr/cache": "~1.0", + "psr/log": "~1.0", + "psr/simple-cache": "^1.0", + "symfony/polyfill-apcu": "~1.1" + }, + "conflict": { + "symfony/var-dumper": "<3.3" + }, + "provide": { + "psr/cache-implementation": "1.0", + "psr/simple-cache-implementation": "1.0" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/cache": "~1.6", + "doctrine/dbal": "~2.4", + "predis/predis": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Cache component with PSR-6, PSR-16, and tags", + "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], + "time": "2018-05-16T12:49:49+00:00" + }, { "name": "symfony/http-client", "version": "v4.4.18", @@ -4379,16 +4237,16 @@ }, { "name": "symfony/monolog-bundle", - "version": "v3.3.1", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "572e143afc03419a75ab002c80a2fd99299195ff" + "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/572e143afc03419a75ab002c80a2fd99299195ff", - "reference": "572e143afc03419a75ab002c80a2fd99299195ff", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7fbecb371c1c614642c93c6b2cbcdf723ae8809d", + "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d", "shasum": "" }, "require": { @@ -5603,16 +5461,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v3.0.3", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "1c870bdd6ad0cccd45a7e553f80ca881b60a14d6" + "reference": "553d2474288349faed873da8ab7c1551a00d26ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/1c870bdd6ad0cccd45a7e553f80ca881b60a14d6", - "reference": "1c870bdd6ad0cccd45a7e553f80ca881b60a14d6", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/553d2474288349faed873da8ab7c1551a00d26ae", + "reference": "553d2474288349faed873da8ab7c1551a00d26ae", "shasum": "" }, "require": { @@ -6011,114 +5869,6 @@ ], "time": "2015-10-01T07:42:40+00:00" }, - { - "name": "zendframework/zend-code", - "version": "2.6.3", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-code.git", - "reference": "95033f061b083e16cdee60530ec260d7d628b887" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", - "reference": "95033f061b083e16cdee60530ec260d7d628b887", - "shasum": "" - }, - "require": { - "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", - "zendframework/zend-eventmanager": "^2.6 || ^3.0" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.8.21", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "zendframework/zend-stdlib": "Zend\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides facilities to generate arbitrary code using an object oriented interface", - "homepage": "https://github.com/zendframework/zend-code", - "keywords": [ - "code", - "zf2" - ], - "abandoned": "laminas/laminas-code", - "time": "2016-04-20T17:26:42+00:00" - }, - { - "name": "zendframework/zend-eventmanager", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "a5e2583a211f73604691586b8406ff7296a946dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd", - "reference": "a5e2583a211f73604691586b8406ff7296a946dd", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "^0.1", - "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0" - }, - "suggest": { - "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://github.com/zendframework/zend-eventmanager", - "keywords": [ - "event", - "eventmanager", - "events", - "zf2" - ], - "abandoned": "laminas/laminas-eventmanager", - "time": "2018-04-25T15:33:34+00:00" - }, { "name": "zendframework/zend-hydrator", "version": "1.1.0", @@ -6363,12 +6113,68 @@ "time": "2015-04-21T14:06:20+00:00" }, { - "name": "liip/functional-test-bundle", - "version": "1.10.0", + "name": "dunglas/php-property-info", + "version": "v0.2.3", "source": { "type": "git", - "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "cbfa26d5d2ccbf8fd5350c90a77c448f3a630ff8" + "url": "https://github.com/dunglas/php-property-info.git", + "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dunglas/php-property-info/zipball/698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", + "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "doctrine/orm": "~2.3", + "phpdocumentor/reflection": "~1.0", + "phpspec/phpspec": "~2.1" + }, + "suggest": { + "doctrine/orm": "To use Doctrine metadata", + "phpdocumentor/reflection": "To use the PHPDoc", + "symfony/validator": "To use Symfony validator metadata" + }, + "type": "library", + "autoload": { + "psr-0": { + "PropertyInfo\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com" + } + ], + "description": "Retrieve type and description of PHP properties using various sources ", + "homepage": "http://dunglas.fr", + "keywords": [ + "doctrine", + "phpdoc", + "property", + "symfony", + "type", + "validator" + ], + "abandoned": "symfony/property-info", + "time": "2015-12-29T08:21:00+00:00" + }, + { + "name": "liip/functional-test-bundle", + "version": "1.10.0", + "source": { + "type": "git", + "url": "https://github.com/liip/LiipFunctionalTestBundle.git", + "reference": "cbfa26d5d2ccbf8fd5350c90a77c448f3a630ff8" }, "dist": { "type": "zip", @@ -6497,97 +6303,381 @@ "time": "2020-11-13T09:40:50+00:00" }, { - "name": "phing/phing", - "version": "2.16.3", + "name": "nikic/php-parser", + "version": "v0.9.4", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1e5e280ae88a27effa2ae4aa2bd088494ed8594f", + "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.9-dev" + } + }, + "autoload": { + "psr-0": { + "PHPParser": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2013-08-25T17:11:40+00:00" + }, + { + "name": "ocramius/proxy-manager", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/ProxyManager.git", + "reference": "57e9272ec0e8deccf09421596e0e2252df440e11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/57e9272ec0e8deccf09421596e0e2252df440e11", + "reference": "57e9272ec0e8deccf09421596e0e2252df440e11", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "zendframework/zend-code": ">2.2.5,<3.0" + }, + "require-dev": { + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "1.5.*" + }, + "suggest": { + "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", + "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", + "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", + "zendframework/zend-stdlib": "To use the hydrator proxy", + "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "ProxyManager\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", + "homepage": "https://github.com/Ocramius/ProxyManager", + "keywords": [ + "aop", + "lazy loading", + "proxy", + "proxy pattern", + "service proxies" + ], + "time": "2015-08-09T04:28:19+00:00" + }, + { + "name": "phing/phing", + "version": "2.16.3", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/phing.git", + "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/b34c2bf9cd6abd39b4287dee31e68673784c8567", + "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "ext-pdo_sqlite": "*", + "mikey179/vfsstream": "^1.6", + "pdepend/pdepend": "2.x", + "pear/archive_tar": "1.4.x", + "pear/http_request2": "dev-trunk", + "pear/net_growl": "dev-trunk", + "pear/pear-core-minimal": "1.10.1", + "pear/versioncontrol_git": "@dev", + "pear/versioncontrol_svn": "~0.5", + "phpdocumentor/phpdocumentor": "2.x", + "phploc/phploc": "~2.0.6", + "phpmd/phpmd": "~2.2", + "phpunit/phpunit": ">=3.7", + "sebastian/git": "~1.0", + "sebastian/phpcpd": "2.x", + "siad007/versioncontrol_hg": "^1.0", + "simpletest/simpletest": "^1.1", + "squizlabs/php_codesniffer": "~2.2", + "symfony/yaml": "^2.8 || ^3.1 || ^4.0" + }, + "suggest": { + "pdepend/pdepend": "PHP version of JDepend", + "pear/archive_tar": "Tar file management class", + "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository", + "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system", + "phpdocumentor/phpdocumentor": "Documentation Generator for PHP", + "phploc/phploc": "A tool for quickly measuring the size of a PHP project", + "phpmd/phpmd": "PHP version of PMD tool", + "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information", + "phpunit/phpunit": "The PHP Unit Testing Framework", + "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code", + "siad007/versioncontrol_hg": "A library for interfacing with Mercurial repositories.", + "tedivm/jshrink": "Javascript Minifier built in PHP" + }, + "bin": [ + "bin/phing" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.16.x-dev" + } + }, + "autoload": { + "classmap": [ + "classes/phing/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "classes" + ], + "license": [ + "LGPL-3.0-only" + ], + "authors": [ + { + "name": "Michiel Rook", + "email": "mrook@php.net" + }, + { + "name": "Phing Community", + "homepage": "https://www.phing.info/trac/wiki/Development/Contributors" + } + ], + "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", + "homepage": "https://www.phing.info/", + "keywords": [ + "build", + "phing", + "task", + "tool" + ], + "time": "2020-02-03T18:50:54+00:00" + }, + { + "name": "php-coveralls/php-coveralls", + "version": "v2.4.3", + "source": { + "type": "git", + "url": "https://github.com/php-coveralls/php-coveralls.git", + "reference": "909381bd40a17ae6e9076051f0d73293c1c091af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/909381bd40a17ae6e9076051f0d73293c1c091af", + "reference": "909381bd40a17ae6e9076051f0d73293c1c091af", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^6.0 || ^7.0", + "php": "^5.5 || ^7.0 || ^8.0", + "psr/log": "^1.0", + "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0", + "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0", + "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0", + "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" + }, + "bin": [ + "bin/php-coveralls" + ], + "type": "library", + "autoload": { + "psr-4": { + "PhpCoveralls\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "PhpCoveralls\\Tests\\": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "scripts": { + "install-dev-tools": [ + "cd dev-tools && composer update --no-interaction" + ], + "sca": [ + "php dev-tools/vendor/bin/php-cs-fixer fix --dry-run -vv", + "php dev-tools/vendor/bin/phpmd src text build/config/phpmd.xml" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/satooshi/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "abandoned": "php-coveralls/php-coveralls", + "time": "2013-05-04T08:07:33+00:00" + }, + { + "name": "phpdocumentor/reflection", + "version": "1.0.7", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/Reflection.git", + "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/fc40c3f604ac2287eb5c314174d5109b2c699372", + "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372", + "shasum": "" + }, + "require": { + "nikic/php-parser": "~0.9.4", + "php": ">=5.3.3", + "phpdocumentor/reflection-docblock": "~2.0", + "psr/log": "~1.0" + }, + "require-dev": { + "behat/behat": "~2.4", + "mockery/mockery": "~0.8", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "phpDocumentor": [ + "src/", + "tests/unit/", + "tests/mocks/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Reflection library to do Static Analysis for PHP Projects", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2014-11-14T11:43:04+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.5", "source": { "type": "git", - "url": "https://github.com/phingofficial/phing.git", - "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567" + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phingofficial/phing/zipball/b34c2bf9cd6abd39b4287dee31e68673784c8567", - "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": ">=5.3.3" }, "require-dev": { - "ext-pdo_sqlite": "*", - "mikey179/vfsstream": "^1.6", - "pdepend/pdepend": "2.x", - "pear/archive_tar": "1.4.x", - "pear/http_request2": "dev-trunk", - "pear/net_growl": "dev-trunk", - "pear/pear-core-minimal": "1.10.1", - "pear/versioncontrol_git": "@dev", - "pear/versioncontrol_svn": "~0.5", - "phpdocumentor/phpdocumentor": "2.x", - "phploc/phploc": "~2.0.6", - "phpmd/phpmd": "~2.2", - "phpunit/phpunit": ">=3.7", - "sebastian/git": "~1.0", - "sebastian/phpcpd": "2.x", - "siad007/versioncontrol_hg": "^1.0", - "simpletest/simpletest": "^1.1", - "squizlabs/php_codesniffer": "~2.2", - "symfony/yaml": "^2.8 || ^3.1 || ^4.0" + "phpunit/phpunit": "~4.0" }, "suggest": { - "pdepend/pdepend": "PHP version of JDepend", - "pear/archive_tar": "Tar file management class", - "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository", - "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system", - "phpdocumentor/phpdocumentor": "Documentation Generator for PHP", - "phploc/phploc": "A tool for quickly measuring the size of a PHP project", - "phpmd/phpmd": "PHP version of PMD tool", - "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information", - "phpunit/phpunit": "The PHP Unit Testing Framework", - "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code", - "siad007/versioncontrol_hg": "A library for interfacing with Mercurial repositories.", - "tedivm/jshrink": "Javascript Minifier built in PHP" + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, - "bin": [ - "bin/phing" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.16.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "classmap": [ - "classes/phing/" - ] + "psr-0": { + "phpDocumentor": [ + "src/" + ] + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "classes" - ], "license": [ - "LGPL-3.0-only" + "MIT" ], "authors": [ { - "name": "Michiel Rook", - "email": "mrook@php.net" - }, - { - "name": "Phing Community", - "homepage": "https://www.phing.info/trac/wiki/Development/Contributors" + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" } ], - "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", - "homepage": "https://www.phing.info/", - "keywords": [ - "build", - "phing", - "task", - "tool" - ], - "time": "2020-02-03T18:50:54+00:00" + "time": "2016-01-25T08:17:30+00:00" }, { "name": "phpspec/prophecy", @@ -7044,74 +7134,6 @@ "abandoned": true, "time": "2017-06-30T09:13:00+00:00" }, - { - "name": "php-coveralls/php-coveralls", - "version": "v2.4.3", - "source": { - "type": "git", - "url": "https://github.com/php-coveralls/php-coveralls.git", - "reference": "909381bd40a17ae6e9076051f0d73293c1c091af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/909381bd40a17ae6e9076051f0d73293c1c091af", - "reference": "909381bd40a17ae6e9076051f0d73293c1c091af", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0 || ^8.0", - "ext-json": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.0 || ^7.0", - "psr/log": "^1.0", - "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0", - "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0", - "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" - }, - "bin": ["bin/php-coveralls"], - "scripts": { - "install-dev-tools": [ - "cd dev-tools && composer update --no-interaction" - ], - "sca": [ - "php dev-tools/vendor/bin/php-cs-fixer fix --dry-run -vv", - "php dev-tools/vendor/bin/phpmd src text build/config/phpmd.xml" - ] - }, - "type": "library", - "autoload": { - "psr-4": { "PhpCoveralls\\": "src/"} - }, - "autoload-dev": { - "psr-4": { "PhpCoveralls\\Tests\\": "tests/"} - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" - } - ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/satooshi/php-coveralls", - "keywords": [ - "ci", - "coverage", - "github", - "test" - ], - "abandoned": "php-coveralls/php-coveralls", - "time": "2013-05-04T08:07:33+00:00" - }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.2", @@ -7630,11 +7652,120 @@ "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "zendframework/zend-code", + "version": "2.6.3", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-code.git", + "reference": "95033f061b083e16cdee60530ec260d7d628b887" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", + "reference": "95033f061b083e16cdee60530ec260d7d628b887", + "shasum": "" + }, + "require": { + "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "zendframework/zend-eventmanager": "^2.6 || ^3.0" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.8.21", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "suggest": { + "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", + "zendframework/zend-stdlib": "Zend\\Stdlib component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Code\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides facilities to generate arbitrary code using an object oriented interface", + "homepage": "https://github.com/zendframework/zend-code", + "keywords": [ + "code", + "zf2" + ], + "abandoned": "laminas/laminas-code", + "time": "2016-04-20T17:26:42+00:00" + }, + { + "name": "zendframework/zend-eventmanager", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-eventmanager.git", + "reference": "a5e2583a211f73604691586b8406ff7296a946dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd", + "reference": "a5e2583a211f73604691586b8406ff7296a946dd", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "athletic/athletic": "^0.1", + "container-interop/container-interop": "^1.1.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0" + }, + "suggest": { + "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\EventManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Trigger and listen to events within a PHP application", + "homepage": "https://github.com/zendframework/zend-eventmanager", + "keywords": [ + "event", + "eventmanager", + "events", + "zf2" + ], + "abandoned": "laminas/laminas-eventmanager", + "time": "2018-04-25T15:33:34+00:00" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { + "api-platform/core": 20, "nfq-alpha/sprite-bundle": 20, "partkeepr/extjs6": 20, "partkeepr/remote-file-loader": 20 @@ -7642,7 +7773,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.6.0" + "php": "7.1.33" }, "platform-dev": [], "plugin-api-version": "1.1.0" From 411061fa23febf286a78a365f23c17dd0fe1ceba Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 10:27:27 +0200 Subject: [PATCH 083/140] patter -> path for Symf 3, is this a case ? --- app/config/security.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index 8e3c3aa19..838f571a8 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -30,11 +30,15 @@ security: firewalls: login: - pattern: ^/api/users/getSalt +#sym 2x ? pattern: ^/api/users/getSalt +#symf 3 ? + path: ^/api/users/getSalt security: false main: stateless: false # Stores authentification within a cookie. This is important to allow file uploads without having to send authentification data. - pattern: ^/api/.* +#symf 2x ? pattern: ^/api/.* +#symf 3 ? + path: ^/api/.* provider: chain_provider fr3d_ldap_httpbasic: provider: chain_provider From fc64b9e826f3e34b7d07763c6238e03573cf7275 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 10:32:56 +0200 Subject: [PATCH 084/140] symf 3 added strict_email in validation --- app/config/config_framework.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/config/config_framework.yml b/app/config/config_framework.yml index 0dc7bf3c8..3ef4e7786 100644 --- a/app/config/config_framework.yml +++ b/app/config/config_framework.yml @@ -8,7 +8,7 @@ framework: strict_requirements: ~ form: ~ csrf_protection: ~ - validation: { enabled: true, enable_annotations: true } + validation: { enabled: true, enable_annotations: true, strict_email: true } templating: engines: ['twig'] #assets_version: SomeVersionScheme @@ -17,3 +17,16 @@ framework: session: ~ fragments: ~ http_method_override: true + cache: +# app: cache.adapter.apcu + app: cache.adapter.filesystem + system: cache.adapter.system + directory: /var/www/partkeepr/app/cache +# pools: +# app.cache.api: +# adapter : [cache.app] + pools: + app.cache.api: + adapter : [cache.adapter.memcached] + default_lifetime : 3600 + \ No newline at end of file From 3dc10a54783a1060023d7ca3454118a97135d297 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 10:37:42 +0200 Subject: [PATCH 085/140] symf 3 added api in validation --- app/config/config_framework.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config_framework.yml b/app/config/config_framework.yml index 3ef4e7786..148081629 100644 --- a/app/config/config_framework.yml +++ b/app/config/config_framework.yml @@ -8,7 +8,7 @@ framework: strict_requirements: ~ form: ~ csrf_protection: ~ - validation: { enabled: true, enable_annotations: true, strict_email: true } + validation: { enabled: true, api: auto, enable_annotations: true, strict_email: true } templating: engines: ['twig'] #assets_version: SomeVersionScheme From 0e44895e7d64578ed6992b574d6d411c190164f5 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 10:43:05 +0200 Subject: [PATCH 086/140] symf 3 - new DebugBundle, as recommended --- app/AppKernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index 006e16cb0..7821f4e14 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -35,6 +35,7 @@ public function registerBundles() // Developer bundles if (in_array($this->getEnvironment(), ['dev', 'test'])) { + $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(); From 7161e1c8c4d53e64eff1797bee0f8cb4d47a4d9a Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:06:12 +0200 Subject: [PATCH 087/140] relax php version in composer json lock --- composer.json | 16 +++++++++------- composer.lock | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 441be289e..4efb7ad79 100755 --- a/composer.json +++ b/composer.json @@ -39,10 +39,11 @@ } ], "require": { - "php": "7.1.33", + "php": ">=7.1.0", "atelierspierrot/famfamfam-silk-sprite": "1.0.0", "brainbits/fugue-icons-bundle": "3.5.6", "doctrine/doctrine-bundle": "1.10.3", + "doctrine/doctrine-cache-bundle": "1.3.5", "doctrine/doctrine-fixtures-bundle": "v2.4.1", "doctrine/doctrine-migrations-bundle": "v1.3.2", "doctrine/migrations": "v1.2.2", @@ -85,12 +86,13 @@ "liip/functional-test-bundle": "1.10.0", "phing/phing": "2.16.3" }, - "autoload": { - "psr-0": { - "": "src/", - "PartKeepr": "src/backend" - } - }, + "autoload": { + "psr-0": { "": "src/", "PartKeepr": "src/backend" }, + "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] + }, + "autoload-dev": { + "psr-4": { "Tests\\": "tests/" } + }, "minimum-stability": "dev", "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index c5293ce68..51665e912 100644 --- a/composer.lock +++ b/composer.lock @@ -7773,7 +7773,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "7.1.33" + "php": ">=7.1.0" }, "platform-dev": [], "plugin-api-version": "1.1.0" From 8da6e34214d8430cdb6613d86242e94d720d321e Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:06:57 +0200 Subject: [PATCH 088/140] revert syntax still not recognized --- app/config/config_framework.yml | 9 ++++----- app/config/security.yml | 10 ++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/config/config_framework.yml b/app/config/config_framework.yml index 148081629..9b2d8cb2b 100644 --- a/app/config/config_framework.yml +++ b/app/config/config_framework.yml @@ -8,7 +8,8 @@ framework: strict_requirements: ~ form: ~ csrf_protection: ~ - validation: { enabled: true, api: auto, enable_annotations: true, strict_email: true } +# validation: { enabled: true, api: auto, enable_annotations: true, strict_email: true } + validation: { enabled: true, enable_annotations: true, strict_email: true } templating: engines: ['twig'] #assets_version: SomeVersionScheme @@ -25,8 +26,6 @@ framework: # pools: # app.cache.api: # adapter : [cache.app] - pools: - app.cache.api: - adapter : [cache.adapter.memcached] - default_lifetime : 3600 +# adapter : [cache.adapter.memcached] +# default_lifetime : 3600 \ No newline at end of file diff --git a/app/config/security.yml b/app/config/security.yml index 838f571a8..3f0253515 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -30,15 +30,13 @@ security: firewalls: login: -#sym 2x ? pattern: ^/api/users/getSalt -#symf 3 ? - path: ^/api/users/getSalt + pattern: ^/api/users/getSalt +#symf 3 ? path: ^/api/users/getSalt security: false main: stateless: false # Stores authentification within a cookie. This is important to allow file uploads without having to send authentification data. -#symf 2x ? pattern: ^/api/.* -#symf 3 ? - path: ^/api/.* + pattern: ^/api/.* +#symf 3 ? path: ^/api/.* provider: chain_provider fr3d_ldap_httpbasic: provider: chain_provider From 93ef2b328084a0a5b0700cab03ccf6274b165543 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:07:26 +0200 Subject: [PATCH 089/140] working with cache configs ... --- app/config/config_dunglas.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/config/config_dunglas.yml b/app/config/config_dunglas.yml index cc9e5d69b..0c3d34a04 100644 --- a/app/config/config_dunglas.yml +++ b/app/config/config_dunglas.yml @@ -1,6 +1,10 @@ api_platform: title: "PartKeepr" description: "The PartKeepr REST API" + eager_loading: + enabled: false +# cache: %cache.dunglas% +#in v1 cache: false # The caching service to use. Set to "dunglas_api.mapping.cache.apc" to enable APC metadata caching. collection: order_parameter_name: 'order' order: 'ASC' @@ -14,6 +18,4 @@ api_platform: # csv: ['text/csv'] csv: ['text/comma-separated-values'] xlsx: ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'] -# supported_formats: [ "jsonld", "csv", "xlsx" ] -# cache: %cache.dunglas% -#in v1 cache: false # The caching service to use. Set to "dunglas_api.mapping.cache.apc" to enable APC metadata caching. +#in v1 supported_formats: [ "jsonld", "csv", "xlsx" ] From 7911fa742068af9ce3987cb8a51320c91da5f665 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:49:16 +0200 Subject: [PATCH 090/140] following the standar for AppKernel --- app/AppKernel.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 7821f4e14..7a9e9bf7f 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -1,7 +1,7 @@ getEnvironment(), ['dev', 'test'])) { + if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); + $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); $bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(); } @@ -80,10 +82,10 @@ public function registerBundles() */ public function registerContainerConfiguration(LoaderInterface $loader) { - $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); + $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); if ($this->getEnvironment() !== 'test') { - $customConfig = __DIR__.'/config/config_custom.yml'; + $customConfig = $this->getRootDir().'/config/config_custom.yml'; if (file_exists($customConfig)) { $loader->load($customConfig); @@ -102,6 +104,11 @@ public function getCustomBundles() return []; } + public function getRootDir() + { + return __DIR__; + } + /** * Override to allow different cache environments set by the environment variable PARTKEEPR_ENVIRONMENT. * @@ -119,6 +126,11 @@ public function getCacheDir() // return dirname(__DIR__).'/var/cache/'.$this->getEnvironment(); } + public function getLogDir() + { + return dirname(__DIR__).'/var/logs'; + } + /** * Override to avoid stripping comments. From b653499c200062c0c13c1f726cab33229350ad1a Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:53:34 +0200 Subject: [PATCH 091/140] comment out AsseticBundle --- app/AppKernel.php | 2 +- app/config/config.yml | 22 +++++++++++----------- app/config/config_dev.yml | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 7a9e9bf7f..5fe37fd02 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -16,7 +16,7 @@ public function registerBundles() new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), - new Symfony\Bundle\AsseticBundle\AsseticBundle(), +// new Symfony\Bundle\AsseticBundle\AsseticBundle(), new FOS\RestBundle\FOSRestBundle(), new FOS\UserBundle\FOSUserBundle(), new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index 1ef32805e..7a6f54785 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -44,17 +44,17 @@ sensio_framework_extra: router: { annotations: true } # Assetic Configuration -assetic: - debug: %kernel.debug% - use_controller: false - bundles: [ PartKeeprFrontendBundle, PartKeeprMobileFrontendBundle ] - #java: /usr/bin/java - filters: - cssrewrite: ~ - #closure: - # jar: %kernel.root_dir%/Resources/java/compiler.jar - #yui_css: - # jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar +## assetic: +## debug: %kernel.debug% +## use_controller: false +## bundles: [ PartKeeprFrontendBundle, PartKeeprMobileFrontendBundle ] +## #java: /usr/bin/java +## filters: +## cssrewrite: ~ +## #closure: +## # jar: %kernel.root_dir%/Resources/java/compiler.jar +## #yui_css: +## # jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar twig: exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction' diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index a1ae888db..9e39ac489 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -29,8 +29,8 @@ monolog: # type: chromephp # level: info -assetic: - use_controller: true +## assetic: +## use_controller: true #swiftmailer: # delivery_address: me@example.com From 23e6f26f87c00f601dfedf71d78603332bbeeb8f Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:57:03 +0200 Subject: [PATCH 092/140] autoload.php and bootstrap.php.cache removed --- {app => migrated}/autoload.php | 0 migrated/bootstrap.php.cache | 1410 ++++++++++++++++++++++++++++++++ 2 files changed, 1410 insertions(+) rename {app => migrated}/autoload.php (100%) create mode 100644 migrated/bootstrap.php.cache diff --git a/app/autoload.php b/migrated/autoload.php similarity index 100% rename from app/autoload.php rename to migrated/autoload.php diff --git a/migrated/bootstrap.php.cache b/migrated/bootstrap.php.cache new file mode 100644 index 000000000..0f01bcde2 --- /dev/null +++ b/migrated/bootstrap.php.cache @@ -0,0 +1,1410 @@ +parameters = $parameters; +} +public function all() +{ +return $this->parameters; +} +public function keys() +{ +return array_keys($this->parameters); +} +public function replace(array $parameters = array()) +{ +$this->parameters = $parameters; +} +public function add(array $parameters = array()) +{ +$this->parameters = array_replace($this->parameters, $parameters); +} +public function get($key, $default = null) +{ +return array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default; +} +public function set($key, $value) +{ +$this->parameters[$key] = $value; +} +public function has($key) +{ +return array_key_exists($key, $this->parameters); +} +public function remove($key) +{ +unset($this->parameters[$key]); +} +public function getAlpha($key, $default ='') +{ +return preg_replace('/[^[:alpha:]]/','', $this->get($key, $default)); +} +public function getAlnum($key, $default ='') +{ +return preg_replace('/[^[:alnum:]]/','', $this->get($key, $default)); +} +public function getDigits($key, $default ='') +{ +return str_replace(array('-','+'),'', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT)); +} +public function getInt($key, $default = 0) +{ +return (int) $this->get($key, $default); +} +public function getBoolean($key, $default = false) +{ +return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN); +} +public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array()) +{ +$value = $this->get($key, $default); +if (!is_array($options) && $options) { +$options = array('flags'=> $options); +} +if (is_array($value) && !isset($options['flags'])) { +$options['flags'] = FILTER_REQUIRE_ARRAY; +} +return filter_var($value, $filter, $options); +} +public function getIterator() +{ +return new \ArrayIterator($this->parameters); +} +public function count() +{ +return count($this->parameters); +} +} +} +namespace Symfony\Component\HttpFoundation +{ +class HeaderBag implements \IteratorAggregate, \Countable +{ +protected $headers = array(); +protected $cacheControl = array(); +public function __construct(array $headers = array()) +{ +foreach ($headers as $key => $values) { +$this->set($key, $values); +} +} +public function __toString() +{ +if (!$headers = $this->all()) { +return''; +} +ksort($headers); +$max = max(array_map('strlen', array_keys($headers))) + 1; +$content =''; +foreach ($headers as $name => $values) { +$name = implode('-', array_map('ucfirst', explode('-', $name))); +foreach ($values as $value) { +$content .= sprintf("%-{$max}s %s\r\n", $name.':', $value); +} +} +return $content; +} +public function all() +{ +return $this->headers; +} +public function keys() +{ +return array_keys($this->all()); +} +public function replace(array $headers = array()) +{ +$this->headers = array(); +$this->add($headers); +} +public function add(array $headers) +{ +foreach ($headers as $key => $values) { +$this->set($key, $values); +} +} +public function get($key, $default = null, $first = true) +{ +$key = str_replace('_','-', strtolower($key)); +$headers = $this->all(); +if (!array_key_exists($key, $headers)) { +if (null === $default) { +return $first ? null : array(); +} +return $first ? $default : array($default); +} +if ($first) { +return \count($headers[$key]) ? $headers[$key][0] : $default; +} +return $headers[$key]; +} +public function set($key, $values, $replace = true) +{ +$key = str_replace('_','-', strtolower($key)); +if (\is_array($values)) { +$values = array_values($values); +if (true === $replace || !isset($this->headers[$key])) { +$this->headers[$key] = $values; +} else { +$this->headers[$key] = array_merge($this->headers[$key], $values); +} +} else { +if (true === $replace || !isset($this->headers[$key])) { +$this->headers[$key] = array($values); +} else { +$this->headers[$key][] = $values; +} +} +if ('cache-control'=== $key) { +$this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key])); +} +} +public function has($key) +{ +return array_key_exists(str_replace('_','-', strtolower($key)), $this->all()); +} +public function contains($key, $value) +{ +return in_array($value, $this->get($key, null, false)); +} +public function remove($key) +{ +$key = str_replace('_','-', strtolower($key)); +unset($this->headers[$key]); +if ('cache-control'=== $key) { +$this->cacheControl = array(); +} +} +public function getDate($key, \DateTime $default = null) +{ +if (null === $value = $this->get($key)) { +return $default; +} +if (false === $date = \DateTime::createFromFormat(DATE_RFC2822, $value)) { +throw new \RuntimeException(sprintf('The %s HTTP header is not parseable (%s).', $key, $value)); +} +return $date; +} +public function addCacheControlDirective($key, $value = true) +{ +$this->cacheControl[$key] = $value; +$this->set('Cache-Control', $this->getCacheControlHeader()); +} +public function hasCacheControlDirective($key) +{ +return array_key_exists($key, $this->cacheControl); +} +public function getCacheControlDirective($key) +{ +return array_key_exists($key, $this->cacheControl) ? $this->cacheControl[$key] : null; +} +public function removeCacheControlDirective($key) +{ +unset($this->cacheControl[$key]); +$this->set('Cache-Control', $this->getCacheControlHeader()); +} +public function getIterator() +{ +return new \ArrayIterator($this->headers); +} +public function count() +{ +return count($this->headers); +} +protected function getCacheControlHeader() +{ +$parts = array(); +ksort($this->cacheControl); +foreach ($this->cacheControl as $key => $value) { +if (true === $value) { +$parts[] = $key; +} else { +if (preg_match('#[^a-zA-Z0-9._-]#', $value)) { +$value ='"'.$value.'"'; +} +$parts[] = "$key=$value"; +} +} +return implode(', ', $parts); +} +protected function parseCacheControl($header) +{ +$cacheControl = array(); +preg_match_all('#([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?#', $header, $matches, PREG_SET_ORDER); +foreach ($matches as $match) { +$cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true); +} +return $cacheControl; +} +} +} +namespace Symfony\Component\HttpFoundation +{ +use Symfony\Component\HttpFoundation\File\UploadedFile; +class FileBag extends ParameterBag +{ +private static $fileKeys = array('error','name','size','tmp_name','type'); +public function __construct(array $parameters = array()) +{ +$this->replace($parameters); +} +public function replace(array $files = array()) +{ +$this->parameters = array(); +$this->add($files); +} +public function set($key, $value) +{ +if (!is_array($value) && !$value instanceof UploadedFile) { +throw new \InvalidArgumentException('An uploaded file must be an array or an instance of UploadedFile.'); +} +parent::set($key, $this->convertFileInformation($value)); +} +public function add(array $files = array()) +{ +foreach ($files as $key => $file) { +$this->set($key, $file); +} +} +protected function convertFileInformation($file) +{ +if ($file instanceof UploadedFile) { +return $file; +} +$file = $this->fixPhpFilesArray($file); +if (is_array($file)) { +$keys = array_keys($file); +sort($keys); +if ($keys == self::$fileKeys) { +if (UPLOAD_ERR_NO_FILE == $file['error']) { +$file = null; +} else { +$file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']); +} +} else { +$file = array_map(array($this,'convertFileInformation'), $file); +if (array_keys($keys) === $keys) { +$file = array_filter($file); +} +} +} +return $file; +} +protected function fixPhpFilesArray($data) +{ +if (!is_array($data)) { +return $data; +} +$keys = array_keys($data); +sort($keys); +if (self::$fileKeys != $keys || !isset($data['name']) || !is_array($data['name'])) { +return $data; +} +$files = $data; +foreach (self::$fileKeys as $k) { +unset($files[$k]); +} +foreach ($data['name'] as $key => $name) { +$files[$key] = $this->fixPhpFilesArray(array('error'=> $data['error'][$key],'name'=> $name,'type'=> $data['type'][$key],'tmp_name'=> $data['tmp_name'][$key],'size'=> $data['size'][$key], +)); +} +return $files; +} +} +} +namespace Symfony\Component\HttpFoundation +{ +class ServerBag extends ParameterBag +{ +public function getHeaders() +{ +$headers = array(); +$contentHeaders = array('CONTENT_LENGTH'=> true,'CONTENT_MD5'=> true,'CONTENT_TYPE'=> true); +foreach ($this->parameters as $key => $value) { +if (0 === strpos($key,'HTTP_')) { +$headers[substr($key, 5)] = $value; +} +elseif (isset($contentHeaders[$key])) { +$headers[$key] = $value; +} +} +if (isset($this->parameters['PHP_AUTH_USER'])) { +$headers['PHP_AUTH_USER'] = $this->parameters['PHP_AUTH_USER']; +$headers['PHP_AUTH_PW'] = isset($this->parameters['PHP_AUTH_PW']) ? $this->parameters['PHP_AUTH_PW'] :''; +} else { +$authorizationHeader = null; +if (isset($this->parameters['HTTP_AUTHORIZATION'])) { +$authorizationHeader = $this->parameters['HTTP_AUTHORIZATION']; +} elseif (isset($this->parameters['REDIRECT_HTTP_AUTHORIZATION'])) { +$authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION']; +} +if (null !== $authorizationHeader) { +if (0 === stripos($authorizationHeader,'basic ')) { +$exploded = explode(':', base64_decode(substr($authorizationHeader, 6)), 2); +if (2 == count($exploded)) { +list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded; +} +} elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader,'digest '))) { +$headers['PHP_AUTH_DIGEST'] = $authorizationHeader; +$this->parameters['PHP_AUTH_DIGEST'] = $authorizationHeader; +} elseif (0 === stripos($authorizationHeader,'bearer ')) { +$headers['AUTHORIZATION'] = $authorizationHeader; +} +} +} +if (isset($headers['AUTHORIZATION'])) { +return $headers; +} +if (isset($headers['PHP_AUTH_USER'])) { +$headers['AUTHORIZATION'] ='Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']); +} elseif (isset($headers['PHP_AUTH_DIGEST'])) { +$headers['AUTHORIZATION'] = $headers['PHP_AUTH_DIGEST']; +} +return $headers; +} +} +} +namespace Symfony\Component\HttpFoundation +{ +use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException; +use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException; +use Symfony\Component\HttpFoundation\Session\SessionInterface; +class Request +{ +const HEADER_FORWARDED = 0b00001; const HEADER_X_FORWARDED_FOR = 0b00010; +const HEADER_X_FORWARDED_HOST = 0b00100; +const HEADER_X_FORWARDED_PROTO = 0b01000; +const HEADER_X_FORWARDED_PORT = 0b10000; +const HEADER_X_FORWARDED_ALL = 0b11110; const HEADER_X_FORWARDED_AWS_ELB = 0b11010; +const HEADER_CLIENT_IP = self::HEADER_X_FORWARDED_FOR; +const HEADER_CLIENT_HOST = self::HEADER_X_FORWARDED_HOST; +const HEADER_CLIENT_PROTO = self::HEADER_X_FORWARDED_PROTO; +const HEADER_CLIENT_PORT = self::HEADER_X_FORWARDED_PORT; +const METHOD_HEAD ='HEAD'; +const METHOD_GET ='GET'; +const METHOD_POST ='POST'; +const METHOD_PUT ='PUT'; +const METHOD_PATCH ='PATCH'; +const METHOD_DELETE ='DELETE'; +const METHOD_PURGE ='PURGE'; +const METHOD_OPTIONS ='OPTIONS'; +const METHOD_TRACE ='TRACE'; +const METHOD_CONNECT ='CONNECT'; +protected static $trustedProxies = array(); +protected static $trustedHostPatterns = array(); +protected static $trustedHosts = array(); +protected static $trustedHeaders = array( +self::HEADER_FORWARDED =>'FORWARDED', +self::HEADER_CLIENT_IP =>'X_FORWARDED_FOR', +self::HEADER_CLIENT_HOST =>'X_FORWARDED_HOST', +self::HEADER_CLIENT_PROTO =>'X_FORWARDED_PROTO', +self::HEADER_CLIENT_PORT =>'X_FORWARDED_PORT', +); +protected static $httpMethodParameterOverride = false; +public $attributes; +public $request; +public $query; +public $server; +public $files; +public $cookies; +public $headers; +protected $content; +protected $languages; +protected $charsets; +protected $encodings; +protected $acceptableContentTypes; +protected $pathInfo; +protected $requestUri; +protected $baseUrl; +protected $basePath; +protected $method; +protected $format; +protected $session; +protected $locale; +protected $defaultLocale ='en'; +protected static $formats; +protected static $requestFactory; +private $isHostValid = true; +private $isForwardedValid = true; +private static $trustedHeaderSet = -1; +private static $trustedHeaderNames = array( +self::HEADER_FORWARDED =>'FORWARDED', +self::HEADER_CLIENT_IP =>'X_FORWARDED_FOR', +self::HEADER_CLIENT_HOST =>'X_FORWARDED_HOST', +self::HEADER_CLIENT_PROTO =>'X_FORWARDED_PROTO', +self::HEADER_CLIENT_PORT =>'X_FORWARDED_PORT', +); +private static $forwardedParams = array( +self::HEADER_X_FORWARDED_FOR =>'for', +self::HEADER_X_FORWARDED_HOST =>'host', +self::HEADER_X_FORWARDED_PROTO =>'proto', +self::HEADER_X_FORWARDED_PORT =>'host', +); +public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null) +{ +$this->initialize($query, $request, $attributes, $cookies, $files, $server, $content); +} +public function initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null) +{ +$this->request = new ParameterBag($request); +$this->query = new ParameterBag($query); +$this->attributes = new ParameterBag($attributes); +$this->cookies = new ParameterBag($cookies); +$this->files = new FileBag($files); +$this->server = new ServerBag($server); +$this->headers = new HeaderBag($this->server->getHeaders()); +$this->content = $content; +$this->languages = null; +$this->charsets = null; +$this->encodings = null; +$this->acceptableContentTypes = null; +$this->pathInfo = null; +$this->requestUri = null; +$this->baseUrl = null; +$this->basePath = null; +$this->method = null; +$this->format = null; +} +public static function createFromGlobals() +{ +$server = $_SERVER; +if ('cli-server'=== PHP_SAPI) { +if (array_key_exists('HTTP_CONTENT_LENGTH', $_SERVER)) { +$server['CONTENT_LENGTH'] = $_SERVER['HTTP_CONTENT_LENGTH']; +} +if (array_key_exists('HTTP_CONTENT_TYPE', $_SERVER)) { +$server['CONTENT_TYPE'] = $_SERVER['HTTP_CONTENT_TYPE']; +} +} +$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $server); +if (0 === strpos($request->headers->get('CONTENT_TYPE'),'application/x-www-form-urlencoded') +&& in_array(strtoupper($request->server->get('REQUEST_METHOD','GET')), array('PUT','DELETE','PATCH')) +) { +parse_str($request->getContent(), $data); +$request->request = new ParameterBag($data); +} +return $request; +} +public static function create($uri, $method ='GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null) +{ +$server = array_replace(array('SERVER_NAME'=>'localhost','SERVER_PORT'=> 80,'HTTP_HOST'=>'localhost','HTTP_USER_AGENT'=>'Symfony/3.X','HTTP_ACCEPT'=>'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8','HTTP_ACCEPT_LANGUAGE'=>'en-us,en;q=0.5','HTTP_ACCEPT_CHARSET'=>'ISO-8859-1,utf-8;q=0.7,*;q=0.7','REMOTE_ADDR'=>'127.0.0.1','SCRIPT_NAME'=>'','SCRIPT_FILENAME'=>'','SERVER_PROTOCOL'=>'HTTP/1.1','REQUEST_TIME'=> time(), +), $server); +$server['PATH_INFO'] =''; +$server['REQUEST_METHOD'] = strtoupper($method); +$components = parse_url($uri); +if (isset($components['host'])) { +$server['SERVER_NAME'] = $components['host']; +$server['HTTP_HOST'] = $components['host']; +} +if (isset($components['scheme'])) { +if ('https'=== $components['scheme']) { +$server['HTTPS'] ='on'; +$server['SERVER_PORT'] = 443; +} else { +unset($server['HTTPS']); +$server['SERVER_PORT'] = 80; +} +} +if (isset($components['port'])) { +$server['SERVER_PORT'] = $components['port']; +$server['HTTP_HOST'] = $server['HTTP_HOST'].':'.$components['port']; +} +if (isset($components['user'])) { +$server['PHP_AUTH_USER'] = $components['user']; +} +if (isset($components['pass'])) { +$server['PHP_AUTH_PW'] = $components['pass']; +} +if (!isset($components['path'])) { +$components['path'] ='/'; +} +switch (strtoupper($method)) { +case'POST': +case'PUT': +case'DELETE': +if (!isset($server['CONTENT_TYPE'])) { +$server['CONTENT_TYPE'] ='application/x-www-form-urlencoded'; +} +case'PATCH': +$request = $parameters; +$query = array(); +break; +default: +$request = array(); +$query = $parameters; +break; +} +$queryString =''; +if (isset($components['query'])) { +parse_str(html_entity_decode($components['query']), $qs); +if ($query) { +$query = array_replace($qs, $query); +$queryString = http_build_query($query,'','&'); +} else { +$query = $qs; +$queryString = $components['query']; +} +} elseif ($query) { +$queryString = http_build_query($query,'','&'); +} +$server['REQUEST_URI'] = $components['path'].(''!== $queryString ?'?'.$queryString :''); +$server['QUERY_STRING'] = $queryString; +return self::createRequestFromFactory($query, $request, array(), $cookies, $files, $server, $content); +} +public static function setFactory($callable) +{ +self::$requestFactory = $callable; +} +public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null) +{ +$dup = clone $this; +if (null !== $query) { +$dup->query = new ParameterBag($query); +} +if (null !== $request) { +$dup->request = new ParameterBag($request); +} +if (null !== $attributes) { +$dup->attributes = new ParameterBag($attributes); +} +if (null !== $cookies) { +$dup->cookies = new ParameterBag($cookies); +} +if (null !== $files) { +$dup->files = new FileBag($files); +} +if (null !== $server) { +$dup->server = new ServerBag($server); +$dup->headers = new HeaderBag($dup->server->getHeaders()); +} +$dup->languages = null; +$dup->charsets = null; +$dup->encodings = null; +$dup->acceptableContentTypes = null; +$dup->pathInfo = null; +$dup->requestUri = null; +$dup->baseUrl = null; +$dup->basePath = null; +$dup->method = null; +$dup->format = null; +if (!$dup->get('_format') && $this->get('_format')) { +$dup->attributes->set('_format', $this->get('_format')); +} +if (!$dup->getRequestFormat(null)) { +$dup->setRequestFormat($this->getRequestFormat(null)); +} +return $dup; +} +public function __clone() +{ +$this->query = clone $this->query; +$this->request = clone $this->request; +$this->attributes = clone $this->attributes; +$this->cookies = clone $this->cookies; +$this->files = clone $this->files; +$this->server = clone $this->server; +$this->headers = clone $this->headers; +} +public function __toString() +{ +try { +$content = $this->getContent(); +} catch (\LogicException $e) { +return trigger_error($e, E_USER_ERROR); +} +$cookieHeader =''; +$cookies = array(); +foreach ($this->cookies as $k => $v) { +$cookies[] = $k.'='.$v; +} +if (!empty($cookies)) { +$cookieHeader ='Cookie: '.implode('; ', $cookies)."\r\n"; +} +return +sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n". +$this->headers. +$cookieHeader."\r\n". +$content; +} +public function overrideGlobals() +{ +$this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(),'','&'))); +$_GET = $this->query->all(); +$_POST = $this->request->all(); +$_SERVER = $this->server->all(); +$_COOKIE = $this->cookies->all(); +foreach ($this->headers->all() as $key => $value) { +$key = strtoupper(str_replace('-','_', $key)); +if (in_array($key, array('CONTENT_TYPE','CONTENT_LENGTH'))) { +$_SERVER[$key] = implode(', ', $value); +} else { +$_SERVER['HTTP_'.$key] = implode(', ', $value); +} +} +$request = array('g'=> $_GET,'p'=> $_POST,'c'=> $_COOKIE); +$requestOrder = ini_get('request_order') ?: ini_get('variables_order'); +$requestOrder = preg_replace('#[^cgp]#','', strtolower($requestOrder)) ?:'gp'; +$_REQUEST = array(); +foreach (str_split($requestOrder) as $order) { +$_REQUEST = array_merge($_REQUEST, $request[$order]); +} +} +public static function setTrustedProxies(array $proxies) +{ +self::$trustedProxies = $proxies; +if (2 > func_num_args()) { +@trigger_error(sprintf('The %s() method expects a bit field of Request::HEADER_* as second argument since Symfony 3.3. Defining it will be required in 4.0. ', __METHOD__), E_USER_DEPRECATED); +return; +} +$trustedHeaderSet = (int) func_get_arg(1); +foreach (self::$trustedHeaderNames as $header => $name) { +self::$trustedHeaders[$header] = $header & $trustedHeaderSet ? $name : null; +} +self::$trustedHeaderSet = $trustedHeaderSet; +} +public static function getTrustedProxies() +{ +return self::$trustedProxies; +} +public static function getTrustedHeaderSet() +{ +return self::$trustedHeaderSet; +} +public static function setTrustedHosts(array $hostPatterns) +{ +self::$trustedHostPatterns = array_map(function ($hostPattern) { +return sprintf('{%s}i', $hostPattern); +}, $hostPatterns); +self::$trustedHosts = array(); +} +public static function getTrustedHosts() +{ +return self::$trustedHostPatterns; +} +public static function setTrustedHeaderName($key, $value) +{ +@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the $trustedHeaderSet argument of the Request::setTrustedProxies() method instead.', __METHOD__), E_USER_DEPRECATED); +if ('forwarded'=== $key) { +$key = self::HEADER_FORWARDED; +} elseif ('client_ip'=== $key) { +$key = self::HEADER_CLIENT_IP; +} elseif ('client_host'=== $key) { +$key = self::HEADER_CLIENT_HOST; +} elseif ('client_proto'=== $key) { +$key = self::HEADER_CLIENT_PROTO; +} elseif ('client_port'=== $key) { +$key = self::HEADER_CLIENT_PORT; +} elseif (!array_key_exists($key, self::$trustedHeaders)) { +throw new \InvalidArgumentException(sprintf('Unable to set the trusted header name for key "%s".', $key)); +} +self::$trustedHeaders[$key] = $value; +if (null !== $value) { +self::$trustedHeaderNames[$key] = $value; +self::$trustedHeaderSet |= $key; +} else { +self::$trustedHeaderSet &= ~$key; +} +} +public static function getTrustedHeaderName($key) +{ +if (2 > func_num_args() || func_get_arg(1)) { +@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the Request::getTrustedHeaderSet() method instead.', __METHOD__), E_USER_DEPRECATED); +} +if (!array_key_exists($key, self::$trustedHeaders)) { +throw new \InvalidArgumentException(sprintf('Unable to get the trusted header name for key "%s".', $key)); +} +return self::$trustedHeaders[$key]; +} +public static function normalizeQueryString($qs) +{ +if (''== $qs) { +return''; +} +$parts = array(); +$order = array(); +foreach (explode('&', $qs) as $param) { +if (''=== $param ||'='=== $param[0]) { +continue; +} +$keyValuePair = explode('=', $param, 2); +$parts[] = isset($keyValuePair[1]) ? +rawurlencode(urldecode($keyValuePair[0])).'='.rawurlencode(urldecode($keyValuePair[1])) : +rawurlencode(urldecode($keyValuePair[0])); +$order[] = urldecode($keyValuePair[0]); +} +array_multisort($order, SORT_ASC, $parts); +return implode('&', $parts); +} +public static function enableHttpMethodParameterOverride() +{ +self::$httpMethodParameterOverride = true; +} +public static function getHttpMethodParameterOverride() +{ +return self::$httpMethodParameterOverride; +} +public function get($key, $default = null) +{ +if ($this !== $result = $this->attributes->get($key, $this)) { +return $result; +} +if ($this !== $result = $this->query->get($key, $this)) { +return $result; +} +if ($this !== $result = $this->request->get($key, $this)) { +return $result; +} +return $default; +} +public function getSession() +{ +return $this->session; +} +public function hasPreviousSession() +{ +return $this->hasSession() && $this->cookies->has($this->session->getName()); +} +public function hasSession() +{ +return null !== $this->session; +} +public function setSession(SessionInterface $session) +{ +$this->session = $session; +} +public function getClientIps() +{ +$ip = $this->server->get('REMOTE_ADDR'); +if (!$this->isFromTrustedProxy()) { +return array($ip); +} +return $this->getTrustedValues(self::HEADER_CLIENT_IP, $ip) ?: array($ip); +} +public function getClientIp() +{ +$ipAddresses = $this->getClientIps(); +return $ipAddresses[0]; +} +public function getScriptName() +{ +return $this->server->get('SCRIPT_NAME', $this->server->get('ORIG_SCRIPT_NAME','')); +} +public function getPathInfo() +{ +if (null === $this->pathInfo) { +$this->pathInfo = $this->preparePathInfo(); +} +return $this->pathInfo; +} +public function getBasePath() +{ +if (null === $this->basePath) { +$this->basePath = $this->prepareBasePath(); +} +return $this->basePath; +} +public function getBaseUrl() +{ +if (null === $this->baseUrl) { +$this->baseUrl = $this->prepareBaseUrl(); +} +return $this->baseUrl; +} +public function getScheme() +{ +return $this->isSecure() ?'https':'http'; +} +public function getPort() +{ +if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_PORT)) { +$host = $host[0]; +} elseif ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_HOST)) { +$host = $host[0]; +} elseif (!$host = $this->headers->get('HOST')) { +return $this->server->get('SERVER_PORT'); +} +if ('['=== $host[0]) { +$pos = strpos($host,':', strrpos($host,']')); +} else { +$pos = strrpos($host,':'); +} +if (false !== $pos) { +return (int) substr($host, $pos + 1); +} +return'https'=== $this->getScheme() ? 443 : 80; +} +public function getUser() +{ +return $this->headers->get('PHP_AUTH_USER'); +} +public function getPassword() +{ +return $this->headers->get('PHP_AUTH_PW'); +} +public function getUserInfo() +{ +$userinfo = $this->getUser(); +$pass = $this->getPassword(); +if (''!= $pass) { +$userinfo .= ":$pass"; +} +return $userinfo; +} +public function getHttpHost() +{ +$scheme = $this->getScheme(); +$port = $this->getPort(); +if (('http'== $scheme && 80 == $port) || ('https'== $scheme && 443 == $port)) { +return $this->getHost(); +} +return $this->getHost().':'.$port; +} +public function getRequestUri() +{ +if (null === $this->requestUri) { +$this->requestUri = $this->prepareRequestUri(); +} +return $this->requestUri; +} +public function getSchemeAndHttpHost() +{ +return $this->getScheme().'://'.$this->getHttpHost(); +} +public function getUri() +{ +if (null !== $qs = $this->getQueryString()) { +$qs ='?'.$qs; +} +return $this->getSchemeAndHttpHost().$this->getBaseUrl().$this->getPathInfo().$qs; +} +public function getUriForPath($path) +{ +return $this->getSchemeAndHttpHost().$this->getBaseUrl().$path; +} +public function getRelativeUriForPath($path) +{ +if (!isset($path[0]) ||'/'!== $path[0]) { +return $path; +} +if ($path === $basePath = $this->getPathInfo()) { +return''; +} +$sourceDirs = explode('/', isset($basePath[0]) &&'/'=== $basePath[0] ? substr($basePath, 1) : $basePath); +$targetDirs = explode('/', isset($path[0]) &&'/'=== $path[0] ? substr($path, 1) : $path); +array_pop($sourceDirs); +$targetFile = array_pop($targetDirs); +foreach ($sourceDirs as $i => $dir) { +if (isset($targetDirs[$i]) && $dir === $targetDirs[$i]) { +unset($sourceDirs[$i], $targetDirs[$i]); +} else { +break; +} +} +$targetDirs[] = $targetFile; +$path = str_repeat('../', count($sourceDirs)).implode('/', $targetDirs); +return !isset($path[0]) ||'/'=== $path[0] +|| false !== ($colonPos = strpos($path,':')) && ($colonPos < ($slashPos = strpos($path,'/')) || false === $slashPos) +? "./$path" : $path; +} +public function getQueryString() +{ +$qs = static::normalizeQueryString($this->server->get('QUERY_STRING')); +return''=== $qs ? null : $qs; +} +public function isSecure() +{ +if ($this->isFromTrustedProxy() && $proto = $this->getTrustedValues(self::HEADER_CLIENT_PROTO)) { +return in_array(strtolower($proto[0]), array('https','on','ssl','1'), true); +} +$https = $this->server->get('HTTPS'); +return !empty($https) &&'off'!== strtolower($https); +} +public function getHost() +{ +if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_HOST)) { +$host = $host[0]; +} elseif (!$host = $this->headers->get('HOST')) { +if (!$host = $this->server->get('SERVER_NAME')) { +$host = $this->server->get('SERVER_ADDR',''); +} +} +$host = strtolower(preg_replace('/:\d+$/','', trim($host))); +if ($host &&''!== preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/','', $host)) { +if (!$this->isHostValid) { +return''; +} +$this->isHostValid = false; +throw new SuspiciousOperationException(sprintf('Invalid Host "%s".', $host)); +} +if (count(self::$trustedHostPatterns) > 0) { +if (in_array($host, self::$trustedHosts)) { +return $host; +} +foreach (self::$trustedHostPatterns as $pattern) { +if (preg_match($pattern, $host)) { +self::$trustedHosts[] = $host; +return $host; +} +} +if (!$this->isHostValid) { +return''; +} +$this->isHostValid = false; +throw new SuspiciousOperationException(sprintf('Untrusted Host "%s".', $host)); +} +return $host; +} +public function setMethod($method) +{ +$this->method = null; +$this->server->set('REQUEST_METHOD', $method); +} +public function getMethod() +{ +if (null === $this->method) { +$this->method = strtoupper($this->server->get('REQUEST_METHOD','GET')); +if ('POST'=== $this->method) { +if ($method = $this->headers->get('X-HTTP-METHOD-OVERRIDE')) { +$this->method = strtoupper($method); +} elseif (self::$httpMethodParameterOverride) { +$this->method = strtoupper($this->request->get('_method', $this->query->get('_method','POST'))); +} +} +} +return $this->method; +} +public function getRealMethod() +{ +return strtoupper($this->server->get('REQUEST_METHOD','GET')); +} +public function getMimeType($format) +{ +if (null === static::$formats) { +static::initializeFormats(); +} +return isset(static::$formats[$format]) ? static::$formats[$format][0] : null; +} +public static function getMimeTypes($format) +{ +if (null === static::$formats) { +static::initializeFormats(); +} +return isset(static::$formats[$format]) ? static::$formats[$format] : array(); +} +public function getFormat($mimeType) +{ +$canonicalMimeType = null; +if (false !== $pos = strpos($mimeType,';')) { +$canonicalMimeType = substr($mimeType, 0, $pos); +} +if (null === static::$formats) { +static::initializeFormats(); +} +foreach (static::$formats as $format => $mimeTypes) { +if (in_array($mimeType, (array) $mimeTypes)) { +return $format; +} +if (null !== $canonicalMimeType && in_array($canonicalMimeType, (array) $mimeTypes)) { +return $format; +} +} +} +public function setFormat($format, $mimeTypes) +{ +if (null === static::$formats) { +static::initializeFormats(); +} +static::$formats[$format] = is_array($mimeTypes) ? $mimeTypes : array($mimeTypes); +} +public function getRequestFormat($default ='html') +{ +if (null === $this->format) { +$this->format = $this->attributes->get('_format'); +} +return null === $this->format ? $default : $this->format; +} +public function setRequestFormat($format) +{ +$this->format = $format; +} +public function getContentType() +{ +return $this->getFormat($this->headers->get('CONTENT_TYPE')); +} +public function setDefaultLocale($locale) +{ +$this->defaultLocale = $locale; +if (null === $this->locale) { +$this->setPhpDefaultLocale($locale); +} +} +public function getDefaultLocale() +{ +return $this->defaultLocale; +} +public function setLocale($locale) +{ +$this->setPhpDefaultLocale($this->locale = $locale); +} +public function getLocale() +{ +return null === $this->locale ? $this->defaultLocale : $this->locale; +} +public function isMethod($method) +{ +return $this->getMethod() === strtoupper($method); +} +public function isMethodSafe() +{ +if (!func_num_args() || func_get_arg(0)) { +@trigger_error('Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is deprecated since Symfony 3.2 and will throw an exception in 4.0. Disable checking only for cacheable methods by calling the method with `false` as first argument or use the Request::isMethodCacheable() instead.', E_USER_DEPRECATED); +return in_array($this->getMethod(), array('GET','HEAD')); +} +return in_array($this->getMethod(), array('GET','HEAD','OPTIONS','TRACE')); +} +public function isMethodIdempotent() +{ +return in_array($this->getMethod(), array('HEAD','GET','PUT','DELETE','TRACE','OPTIONS','PURGE')); +} +public function isMethodCacheable() +{ +return in_array($this->getMethod(), array('GET','HEAD')); +} +public function getProtocolVersion() +{ +if ($this->isFromTrustedProxy()) { +preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via'), $matches); +if ($matches) { +return'HTTP/'.$matches[2]; +} +} +return $this->server->get('SERVER_PROTOCOL'); +} +public function getContent($asResource = false) +{ +$currentContentIsResource = is_resource($this->content); +if (\PHP_VERSION_ID < 50600 && false === $this->content) { +throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.'); +} +if (true === $asResource) { +if ($currentContentIsResource) { +rewind($this->content); +return $this->content; +} +if (is_string($this->content)) { +$resource = fopen('php://temp','r+'); +fwrite($resource, $this->content); +rewind($resource); +return $resource; +} +$this->content = false; +return fopen('php://input','rb'); +} +if ($currentContentIsResource) { +rewind($this->content); +return stream_get_contents($this->content); +} +if (null === $this->content || false === $this->content) { +$this->content = file_get_contents('php://input'); +} +return $this->content; +} +public function getETags() +{ +return preg_split('/\s*,\s*/', $this->headers->get('if_none_match'), null, PREG_SPLIT_NO_EMPTY); +} +public function isNoCache() +{ +return $this->headers->hasCacheControlDirective('no-cache') ||'no-cache'== $this->headers->get('Pragma'); +} +public function getPreferredLanguage(array $locales = null) +{ +$preferredLanguages = $this->getLanguages(); +if (empty($locales)) { +return isset($preferredLanguages[0]) ? $preferredLanguages[0] : null; +} +if (!$preferredLanguages) { +return $locales[0]; +} +$extendedPreferredLanguages = array(); +foreach ($preferredLanguages as $language) { +$extendedPreferredLanguages[] = $language; +if (false !== $position = strpos($language,'_')) { +$superLanguage = substr($language, 0, $position); +if (!in_array($superLanguage, $preferredLanguages)) { +$extendedPreferredLanguages[] = $superLanguage; +} +} +} +$preferredLanguages = array_values(array_intersect($extendedPreferredLanguages, $locales)); +return isset($preferredLanguages[0]) ? $preferredLanguages[0] : $locales[0]; +} +public function getLanguages() +{ +if (null !== $this->languages) { +return $this->languages; +} +$languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all(); +$this->languages = array(); +foreach ($languages as $lang => $acceptHeaderItem) { +if (false !== strpos($lang,'-')) { +$codes = explode('-', $lang); +if ('i'=== $codes[0]) { +if (count($codes) > 1) { +$lang = $codes[1]; +} +} else { +for ($i = 0, $max = count($codes); $i < $max; ++$i) { +if (0 === $i) { +$lang = strtolower($codes[0]); +} else { +$lang .='_'.strtoupper($codes[$i]); +} +} +} +} +$this->languages[] = $lang; +} +return $this->languages; +} +public function getCharsets() +{ +if (null !== $this->charsets) { +return $this->charsets; +} +return $this->charsets = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all()); +} +public function getEncodings() +{ +if (null !== $this->encodings) { +return $this->encodings; +} +return $this->encodings = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all()); +} +public function getAcceptableContentTypes() +{ +if (null !== $this->acceptableContentTypes) { +return $this->acceptableContentTypes; +} +return $this->acceptableContentTypes = array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all()); +} +public function isXmlHttpRequest() +{ +return'XMLHttpRequest'== $this->headers->get('X-Requested-With'); +} +protected function prepareRequestUri() +{ +$requestUri =''; +if ($this->headers->has('X_ORIGINAL_URL')) { +$requestUri = $this->headers->get('X_ORIGINAL_URL'); +$this->headers->remove('X_ORIGINAL_URL'); +$this->server->remove('HTTP_X_ORIGINAL_URL'); +$this->server->remove('UNENCODED_URL'); +$this->server->remove('IIS_WasUrlRewritten'); +} elseif ($this->headers->has('X_REWRITE_URL')) { +$requestUri = $this->headers->get('X_REWRITE_URL'); +$this->headers->remove('X_REWRITE_URL'); +} elseif ('1'== $this->server->get('IIS_WasUrlRewritten') &&''!= $this->server->get('UNENCODED_URL')) { +$requestUri = $this->server->get('UNENCODED_URL'); +$this->server->remove('UNENCODED_URL'); +$this->server->remove('IIS_WasUrlRewritten'); +} elseif ($this->server->has('REQUEST_URI')) { +$requestUri = $this->server->get('REQUEST_URI'); +$schemeAndHttpHost = $this->getSchemeAndHttpHost(); +if (0 === strpos($requestUri, $schemeAndHttpHost)) { +$requestUri = substr($requestUri, strlen($schemeAndHttpHost)); +} +} elseif ($this->server->has('ORIG_PATH_INFO')) { +$requestUri = $this->server->get('ORIG_PATH_INFO'); +if (''!= $this->server->get('QUERY_STRING')) { +$requestUri .='?'.$this->server->get('QUERY_STRING'); +} +$this->server->remove('ORIG_PATH_INFO'); +} +$this->server->set('REQUEST_URI', $requestUri); +return $requestUri; +} +protected function prepareBaseUrl() +{ +$filename = basename($this->server->get('SCRIPT_FILENAME')); +if (basename($this->server->get('SCRIPT_NAME')) === $filename) { +$baseUrl = $this->server->get('SCRIPT_NAME'); +} elseif (basename($this->server->get('PHP_SELF')) === $filename) { +$baseUrl = $this->server->get('PHP_SELF'); +} elseif (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) { +$baseUrl = $this->server->get('ORIG_SCRIPT_NAME'); } else { +$path = $this->server->get('PHP_SELF',''); +$file = $this->server->get('SCRIPT_FILENAME',''); +$segs = explode('/', trim($file,'/')); +$segs = array_reverse($segs); +$index = 0; +$last = count($segs); +$baseUrl =''; +do { +$seg = $segs[$index]; +$baseUrl ='/'.$seg.$baseUrl; +++$index; +} while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos); +} +$requestUri = $this->getRequestUri(); +if (''!== $requestUri &&'/'!== $requestUri[0]) { +$requestUri ='/'.$requestUri; +} +if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) { +return $prefix; +} +if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, rtrim(dirname($baseUrl),'/'.DIRECTORY_SEPARATOR).'/')) { +return rtrim($prefix,'/'.DIRECTORY_SEPARATOR); +} +$truncatedRequestUri = $requestUri; +if (false !== $pos = strpos($requestUri,'?')) { +$truncatedRequestUri = substr($requestUri, 0, $pos); +} +$basename = basename($baseUrl); +if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) { +return''; +} +if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) { +$baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl)); +} +return rtrim($baseUrl,'/'.DIRECTORY_SEPARATOR); +} +protected function prepareBasePath() +{ +$baseUrl = $this->getBaseUrl(); +if (empty($baseUrl)) { +return''; +} +$filename = basename($this->server->get('SCRIPT_FILENAME')); +if (basename($baseUrl) === $filename) { +$basePath = dirname($baseUrl); +} else { +$basePath = $baseUrl; +} +if ('\\'=== DIRECTORY_SEPARATOR) { +$basePath = str_replace('\\','/', $basePath); +} +return rtrim($basePath,'/'); +} +protected function preparePathInfo() +{ +if (null === ($requestUri = $this->getRequestUri())) { +return'/'; +} +if (false !== $pos = strpos($requestUri,'?')) { +$requestUri = substr($requestUri, 0, $pos); +} +if (''!== $requestUri &&'/'!== $requestUri[0]) { +$requestUri ='/'.$requestUri; +} +if (null === ($baseUrl = $this->getBaseUrl())) { +return $requestUri; +} +$pathInfo = substr($requestUri, strlen($baseUrl)); +if (false === $pathInfo ||''=== $pathInfo) { +return'/'; +} +return (string) $pathInfo; +} +protected static function initializeFormats() +{ +static::$formats = array('html'=> array('text/html','application/xhtml+xml'),'txt'=> array('text/plain'),'js'=> array('application/javascript','application/x-javascript','text/javascript'),'css'=> array('text/css'),'json'=> array('application/json','application/x-json'),'jsonld'=> array('application/ld+json'),'xml'=> array('text/xml','application/xml','application/x-xml'),'rdf'=> array('application/rdf+xml'),'atom'=> array('application/atom+xml'),'rss'=> array('application/rss+xml'),'form'=> array('application/x-www-form-urlencoded'), +); +} +private function setPhpDefaultLocale($locale) +{ +try { +if (class_exists('Locale', false)) { +\Locale::setDefault($locale); +} +} catch (\Exception $e) { +} +} +private function getUrlencodedPrefix($string, $prefix) +{ +if (0 !== strpos(rawurldecode($string), $prefix)) { +return false; +} +$len = strlen($prefix); +if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) { +return $match[0]; +} +return false; +} +private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null) +{ +if (self::$requestFactory) { +$request = call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content); +if (!$request instanceof self) { +throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.'); +} +return $request; +} +return new static($query, $request, $attributes, $cookies, $files, $server, $content); +} +public function isFromTrustedProxy() +{ +return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR'), self::$trustedProxies); +} +private function getTrustedValues($type, $ip = null) +{ +$clientValues = array(); +$forwardedValues = array(); +if (self::$trustedHeaders[$type] && $this->headers->has(self::$trustedHeaders[$type])) { +foreach (explode(',', $this->headers->get(self::$trustedHeaders[$type])) as $v) { +$clientValues[] = (self::HEADER_CLIENT_PORT === $type ?'0.0.0.0:':'').trim($v); +} +} +if (self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) { +$forwardedValues = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]); +$forwardedValues = preg_match_all(sprintf('{(?:%s)=(?:"?\[?)([a-zA-Z0-9\.:_\-/]*+)}', self::$forwardedParams[$type]), $forwardedValues, $matches) ? $matches[1] : array(); +} +if (null !== $ip) { +$clientValues = $this->normalizeAndFilterClientIps($clientValues, $ip); +$forwardedValues = $this->normalizeAndFilterClientIps($forwardedValues, $ip); +} +if ($forwardedValues === $clientValues || !$clientValues) { +return $forwardedValues; +} +if (!$forwardedValues) { +return $clientValues; +} +if (!$this->isForwardedValid) { +return null !== $ip ? array('0.0.0.0', $ip) : array(); +} +$this->isForwardedValid = false; +throw new ConflictingHeadersException(sprintf('The request has both a trusted "%s" header and a trusted "%s" header, conflicting with each other. You should either configure your proxy to remove one of them, or configure your project to distrust the offending one.', self::$trustedHeaders[self::HEADER_FORWARDED], self::$trustedHeaders[$type])); +} +private function normalizeAndFilterClientIps(array $clientIps, $ip) +{ +if (!$clientIps) { +return array(); +} +$clientIps[] = $ip; $firstTrustedIp = null; +foreach ($clientIps as $key => $clientIp) { +if (preg_match('{((?:\d+\.){3}\d+)\:\d+}', $clientIp, $match)) { +$clientIps[$key] = $clientIp = $match[1]; +} +if (!filter_var($clientIp, FILTER_VALIDATE_IP)) { +unset($clientIps[$key]); +continue; +} +if (IpUtils::checkIp($clientIp, self::$trustedProxies)) { +unset($clientIps[$key]); +if (null === $firstTrustedIp) { +$firstTrustedIp = $clientIp; +} +} +} +return $clientIps ? array_reverse($clientIps) : array($firstTrustedIp); +} +} +} +namespace {require __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php';} From bf3c77915a54f3b8932b310a591677dd3c0108d0 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 12:58:04 +0200 Subject: [PATCH 093/140] following the composer.json standard symf 3 - mostly the scripts --- composer.json | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 4efb7ad79..140b84b11 100755 --- a/composer.json +++ b/composer.json @@ -82,6 +82,8 @@ "nelmio/api-doc-bundle": "2.13.5" }, "require-dev": { + "sensio/generator-bundle": "^3.0", + "symfony/phpunit-bridge": "^3.0", "phpunit/phpunit": "5.7.27", "liip/functional-test-bundle": "1.10.0", "phing/phing": "2.16.3" @@ -96,17 +98,37 @@ "minimum-stability": "dev", "scripts": { "post-install-cmd": [ - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ], "post-update-cmd": [ - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ] }, + "config": { + "platform": { + "php": "5.5.9" + } + }, "extra": { + "symfony-app-dir": "app", + "symfony-bin-dir": "bin", + "symfony-var-dir": "var", + "symfony-web-dir": "web", + "symfony-tests-dir": "tests", + "symfony-assets-install": "relative", + "incenteev-parameters": { + "file": "app/config/parameters.yml" + }, "symfony-assets-install": "relative", "assets-dir" : "web/", "installer-paths": { From a4bc54adac4125787dc1370ee059aa9bd1b6103d Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 13:03:32 +0200 Subject: [PATCH 094/140] console moved from app to bin and following the standard --- {app => bin}/console | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {app => bin}/console (100%) diff --git a/app/console b/bin/console similarity index 100% rename from app/console rename to bin/console From 15f4e11a6f6f271ec62eefb877d7122fe920814a Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 13:03:54 +0200 Subject: [PATCH 095/140] console in bin --- bin/console | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/bin/console b/bin/console index 28fff53ca..8cef40b2c 100755 --- a/bin/console +++ b/bin/console @@ -1,23 +1,22 @@ #!/usr/bin/env php getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; +$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev', true); +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption('--no-debug', true) && $env !== 'prod'; if ($debug) { Debug::enable(); From 5ef42ea20b6b42d614df9f49438b1918d5d18198 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 15:15:30 +0200 Subject: [PATCH 096/140] tests moved from src to tests directory and namespace modified --- app/phpunit.xml.dist | 8 ++++---- documentation/developer/UNIT-TESTS.md | 2 +- .../Controller/DefaultControllerTest.php | 4 ++-- .../Tests => tests/AuthBundle}/LegacyAuthTest.php | 4 ++-- .../Services/UserPreferenceServiceTest.php | 4 ++-- .../AuthBundle}/UserPreferenceTest.php | 4 ++-- .../Tests => tests/AuthBundle}/UserTest.php | 4 ++-- .../CategoryBundle}/AbstractCategoryCreateTest.php | 4 ++-- .../CategoryBundle}/AbstractMoveCategoryTest.php | 4 ++-- .../CoreBundle}/Fixtures/versions.json | 0 .../Tests => tests/CoreBundle}/SetupWebTestCase.php | 2 +- .../CoreBundle}/SystemInformationTest.php | 2 +- .../Tests => tests/CoreBundle}/SystemNoticeTest.php | 2 +- .../CoreBundle}/VersionServiceTest.php | 2 +- .../Tests => tests/CoreBundle}/WebTestCase.php | 2 +- .../CronLoggerBundle}/CronLoggerTest.php | 4 ++-- .../DataFixtures/DistributorDataLoader.php | 2 +- .../AdvancedSearchFilterTest.php | 8 ++++---- .../FootprintBundle}/CategoryCreateTest.php | 4 ++-- .../FootprintBundle}/MoveActionTest.php | 4 ++-- .../ImageBundle}/Fixtures/files/uploadtest.png | Bin .../ImageBundle}/ImageControllerTest.php | 4 ++-- .../DataFixtures/ManufacturerDataLoader.php | 2 +- .../PartBundle}/CategoryCreateTest.php | 4 ++-- .../PartBundle}/InternalPartNumberTest.php | 8 ++++---- .../Issues/DistributorAndManufacturerSearchTest.php | 8 ++++---- .../PartBundle}/Issues/StockHistoryLostTest.php | 8 ++++---- .../Tests => tests/PartBundle}/MetaPartTest.php | 8 ++++---- .../Tests => tests/PartBundle}/MoveActionTest.php | 4 ++-- .../Tests => tests/PartBundle}/PartTest.php | 6 +++--- .../Tests => tests/PartBundle}/StockTest.php | 4 ++-- .../Tests => tests/ProjectBundle}/ProjectTest.php | 6 +++--- .../SetupBundle}/ExistingUsersSetupTest.php | 4 ++-- .../SiPrefixBundle}/Model/SiPrefixTest.php | 2 +- .../StorageLocationBundle}/CategoryCreateTest.php | 4 ++-- .../StorageLocationBundle}/MoveActionTest.php | 4 ++-- .../SystemPreferenceTest.php | 4 ++-- .../TipOfTheDayBundle}/SyncTipsTest.php | 6 +++--- .../TipOfTheDayBundle}/TipOfTheDayTest.php | 4 ++-- .../Tests => tests/UnitBundle}/Model/UnitTest.php | 2 +- .../UploadedFileBundle}/FileControllerTest.php | 4 ++-- .../Fixtures/files/uploadtest.png | Bin .../TemporaryFileControllerTest.php | 4 ++-- 43 files changed, 85 insertions(+), 85 deletions(-) rename {src/PartKeepr/AuthBundle/Tests => tests/AuthBundle}/Controller/DefaultControllerTest.php (91%) rename {src/PartKeepr/AuthBundle/Tests => tests/AuthBundle}/LegacyAuthTest.php (93%) rename {src/PartKeepr/AuthBundle/Tests => tests/AuthBundle}/Services/UserPreferenceServiceTest.php (96%) rename {src/PartKeepr/AuthBundle/Tests => tests/AuthBundle}/UserPreferenceTest.php (95%) rename {src/PartKeepr/AuthBundle/Tests => tests/AuthBundle}/UserTest.php (98%) rename {src/PartKeepr/CategoryBundle/Tests => tests/CategoryBundle}/AbstractCategoryCreateTest.php (97%) rename {src/PartKeepr/CategoryBundle/Tests => tests/CategoryBundle}/AbstractMoveCategoryTest.php (95%) rename {src/PartKeepr/CoreBundle/Tests => tests/CoreBundle}/Fixtures/versions.json (100%) rename {src/PartKeepr/CoreBundle/Tests => tests/CoreBundle}/SetupWebTestCase.php (96%) rename {src/PartKeepr/CoreBundle/Tests => tests/CoreBundle}/SystemInformationTest.php (97%) rename {src/PartKeepr/CoreBundle/Tests => tests/CoreBundle}/SystemNoticeTest.php (97%) rename {src/PartKeepr/CoreBundle/Tests => tests/CoreBundle}/VersionServiceTest.php (96%) rename {src/PartKeepr/CoreBundle/Tests => tests/CoreBundle}/WebTestCase.php (95%) rename {src/PartKeepr/CronLoggerBundle/Tests => tests/CronLoggerBundle}/CronLoggerTest.php (90%) rename {src/PartKeepr/DistributorBundle/Tests => tests/DistributorBundle}/DataFixtures/DistributorDataLoader.php (89%) rename {src/PartKeepr/DoctrineReflectionBundle/Tests => tests/DoctrineReflectionBundle}/AdvancedSearchFilterTest.php (97%) rename {src/PartKeepr/FootprintBundle/Tests => tests/FootprintBundle}/CategoryCreateTest.php (79%) rename {src/PartKeepr/FootprintBundle/Tests => tests/FootprintBundle}/MoveActionTest.php (73%) rename {src/PartKeepr/ImageBundle/Tests => tests/ImageBundle}/Fixtures/files/uploadtest.png (100%) rename {src/PartKeepr/ImageBundle/Tests => tests/ImageBundle}/ImageControllerTest.php (95%) rename {src/PartKeepr/ManufacturerBundle/Tests => tests/ManufacturerBundle}/DataFixtures/ManufacturerDataLoader.php (89%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/CategoryCreateTest.php (79%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/InternalPartNumberTest.php (92%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/Issues/DistributorAndManufacturerSearchTest.php (94%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/Issues/StockHistoryLostTest.php (91%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/MetaPartTest.php (89%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/MoveActionTest.php (73%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/PartTest.php (96%) rename {src/PartKeepr/PartBundle/Tests => tests/PartBundle}/StockTest.php (98%) rename {src/PartKeepr/ProjectBundle/Tests => tests/ProjectBundle}/ProjectTest.php (98%) rename {src/PartKeepr/SetupBundle/Tests => tests/SetupBundle}/ExistingUsersSetupTest.php (95%) rename {src/PartKeepr/SiPrefixBundle/Tests => tests/SiPrefixBundle}/Model/SiPrefixTest.php (96%) rename {src/PartKeepr/StorageLocationBundle/Tests => tests/StorageLocationBundle}/CategoryCreateTest.php (79%) rename {src/PartKeepr/StorageLocationBundle/Tests => tests/StorageLocationBundle}/MoveActionTest.php (73%) rename {src/PartKeepr/SystemPreferenceBundle/Tests => tests/SystemPreferenceBundle}/SystemPreferenceTest.php (94%) rename {src/PartKeepr/TipOfTheDayBundle/Tests => tests/TipOfTheDayBundle}/SyncTipsTest.php (82%) rename {src/PartKeepr/TipOfTheDayBundle/Tests => tests/TipOfTheDayBundle}/TipOfTheDayTest.php (96%) rename {src/PartKeepr/UnitBundle/Tests => tests/UnitBundle}/Model/UnitTest.php (94%) rename {src/PartKeepr/UploadedFileBundle/Tests => tests/UploadedFileBundle}/FileControllerTest.php (95%) rename {src/PartKeepr/UploadedFileBundle/Tests => tests/UploadedFileBundle}/Fixtures/files/uploadtest.png (100%) rename {src/PartKeepr/UploadedFileBundle/Tests => tests/UploadedFileBundle}/TemporaryFileControllerTest.php (98%) diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 3c23e39be..c6fe6703b 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -15,8 +15,8 @@ - ../src/*/*Bundle/Tests - ../src/*/Bundle/*Bundle/Tests + ../tests/*/*Bundle + ../tests/*/Bundle/*Bundle @@ -38,10 +38,10 @@ ../src ../src/*/*Bundle/Resources - ../src/*/*Bundle/Tests + ../tests/*/*Bundle ../src/*/*Bundle/DataFixtures ../src/*/Bundle/*Bundle/Resources - ../src/*/Bundle/*Bundle/Tests + ../tests/*/Bundle/*Bundle ../src/backend ../src/frontend ../src/setup diff --git a/documentation/developer/UNIT-TESTS.md b/documentation/developer/UNIT-TESTS.md index f39b4c169..3734d4dca 100644 --- a/documentation/developer/UNIT-TESTS.md +++ b/documentation/developer/UNIT-TESTS.md @@ -28,4 +28,4 @@ If you need to run individual tests, you can do so by using the following comman Full example: -`phpunit -c app/ src/PartKeepr/AuthBundle/Tests/Controller/DefaultControllerTest` +`phpunit -c app/ tests/PartKeepr/AuthBundle/Controller/DefaultControllerTest` diff --git a/src/PartKeepr/AuthBundle/Tests/Controller/DefaultControllerTest.php b/tests/AuthBundle/Controller/DefaultControllerTest.php similarity index 91% rename from src/PartKeepr/AuthBundle/Tests/Controller/DefaultControllerTest.php rename to tests/AuthBundle/Controller/DefaultControllerTest.php index 39ba9b6c1..a65919dcc 100644 --- a/src/PartKeepr/AuthBundle/Tests/Controller/DefaultControllerTest.php +++ b/tests/AuthBundle/Controller/DefaultControllerTest.php @@ -1,10 +1,10 @@ getReferenceRepository(); } diff --git a/src/PartKeepr/FootprintBundle/Tests/CategoryCreateTest.php b/tests/FootprintBundle/CategoryCreateTest.php similarity index 79% rename from src/PartKeepr/FootprintBundle/Tests/CategoryCreateTest.php rename to tests/FootprintBundle/CategoryCreateTest.php index 09f3f6c12..81259e975 100644 --- a/src/PartKeepr/FootprintBundle/Tests/CategoryCreateTest.php +++ b/tests/FootprintBundle/CategoryCreateTest.php @@ -1,8 +1,8 @@ getReferenceRepository(); } diff --git a/src/PartKeepr/PartBundle/Tests/Issues/DistributorAndManufacturerSearchTest.php b/tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php similarity index 94% rename from src/PartKeepr/PartBundle/Tests/Issues/DistributorAndManufacturerSearchTest.php rename to tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php index 68061638d..54b8714af 100644 --- a/src/PartKeepr/PartBundle/Tests/Issues/DistributorAndManufacturerSearchTest.php +++ b/tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php @@ -1,9 +1,9 @@ getReferenceRepository(); } diff --git a/src/PartKeepr/PartBundle/Tests/Issues/StockHistoryLostTest.php b/tests/PartBundle/Issues/StockHistoryLostTest.php similarity index 91% rename from src/PartKeepr/PartBundle/Tests/Issues/StockHistoryLostTest.php rename to tests/PartBundle/Issues/StockHistoryLostTest.php index b652c81ef..d0a190e4c 100644 --- a/src/PartKeepr/PartBundle/Tests/Issues/StockHistoryLostTest.php +++ b/tests/PartBundle/Issues/StockHistoryLostTest.php @@ -1,9 +1,9 @@ getReferenceRepository(); } diff --git a/src/PartKeepr/PartBundle/Tests/MetaPartTest.php b/tests/PartBundle/MetaPartTest.php similarity index 89% rename from src/PartKeepr/PartBundle/Tests/MetaPartTest.php rename to tests/PartBundle/MetaPartTest.php index 2f385a3e7..553a48d2a 100644 --- a/src/PartKeepr/PartBundle/Tests/MetaPartTest.php +++ b/tests/PartBundle/MetaPartTest.php @@ -1,9 +1,9 @@ getReferenceRepository(); } diff --git a/src/PartKeepr/PartBundle/Tests/MoveActionTest.php b/tests/PartBundle/MoveActionTest.php similarity index 73% rename from src/PartKeepr/PartBundle/Tests/MoveActionTest.php rename to tests/PartBundle/MoveActionTest.php index 7535044a4..09145fcba 100644 --- a/src/PartKeepr/PartBundle/Tests/MoveActionTest.php +++ b/tests/PartBundle/MoveActionTest.php @@ -1,8 +1,8 @@ getReferenceRepository(); } diff --git a/src/PartKeepr/PartBundle/Tests/StockTest.php b/tests/PartBundle/StockTest.php similarity index 98% rename from src/PartKeepr/PartBundle/Tests/StockTest.php rename to tests/PartBundle/StockTest.php index 823e0ae9b..d8e0c1188 100644 --- a/src/PartKeepr/PartBundle/Tests/StockTest.php +++ b/tests/PartBundle/StockTest.php @@ -1,11 +1,11 @@ assertGreaterThan(1, $query->getSingleScalarResult()); $this->markTestSkipped( - 'Synchronization of the tips of the day (PartKeepr\TipOfTheDayBundle\Tests\SyncTipsTest) skipped' + 'Synchronization of the tips of the day (PartKeepr\Tests\TipOfTheDayBundle\SyncTipsTest) skipped' ); } } diff --git a/src/PartKeepr/TipOfTheDayBundle/Tests/TipOfTheDayTest.php b/tests/TipOfTheDayBundle/TipOfTheDayTest.php similarity index 96% rename from src/PartKeepr/TipOfTheDayBundle/Tests/TipOfTheDayTest.php rename to tests/TipOfTheDayBundle/TipOfTheDayTest.php index 3bf511a48..fa930cd8c 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Tests/TipOfTheDayTest.php +++ b/tests/TipOfTheDayBundle/TipOfTheDayTest.php @@ -1,10 +1,10 @@ Date: Fri, 14 May 2021 15:19:09 +0200 Subject: [PATCH 097/140] app/bootstrap.php.cache to var/bootstrap.php.cache --- web/app.php | 2 +- web/app_dev.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app.php b/web/app.php index 80154eda9..746264b26 100644 --- a/web/app.php +++ b/web/app.php @@ -3,7 +3,7 @@ use Symfony\Component\ClassLoader\ApcClassLoader; use Symfony\Component\HttpFoundation\Request; -$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; +$loader = require_once __DIR__.'/../var/bootstrap.php.cache'; // Use APC for autoloading to improve performance. // Change 'sf2' to a unique prefix in order to prevent cache key conflicts diff --git a/web/app_dev.php b/web/app_dev.php index 91ab679c4..e720f78ba 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -18,7 +18,7 @@ exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } */ -$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; +$loader = require_once __DIR__.'/../var/bootstrap.php.cache'; // Use APC for autoloading to improve performance. // Change 'sf2' to a unique prefix in order to prevent cache key conflicts From 5c755f9457bb7e713817dce145cf026f0f9a9346 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 15:21:26 +0200 Subject: [PATCH 098/140] SymfonyRequirements.php moved from /app to /var --- {app => var}/SymfonyRequirements.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {app => var}/SymfonyRequirements.php (100%) diff --git a/app/SymfonyRequirements.php b/var/SymfonyRequirements.php similarity index 100% rename from app/SymfonyRequirements.php rename to var/SymfonyRequirements.php From 7a2a6d7fcf99ef877ad0f87057ea29d016308189 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 15:22:58 +0200 Subject: [PATCH 099/140] phpunit.xml.dist moved from /app to / --- app/phpunit.xml.dist => phpunit.xml.dist | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/phpunit.xml.dist => phpunit.xml.dist (100%) diff --git a/app/phpunit.xml.dist b/phpunit.xml.dist similarity index 100% rename from app/phpunit.xml.dist rename to phpunit.xml.dist From 9d7940051a1afd87e233c78e9ac0d3fac4060318 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 15:29:04 +0200 Subject: [PATCH 100/140] update gitignore --- .gitignore | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ce4df8742..2941a8f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,32 @@ -/build +/.web-server-pid +/app/config/parameters.yml +/app/authkey.php +/app/config/parameters.php +/app/config/parameters_setup.php +/app/cache/* +/app/config/parameters.yml +/app/logs/* +/build/ +/phpunit.xml +/var/* +!/var/cache +/var/cache/* +!var/cache/.gitkeep +!/var/logs +/var/logs/* +!var/logs/.gitkeep +!/var/sessions +/var/sessions/* +!var/sessions/.gitkeep +!var/SymfonyRequirements.php +/vendor/ +/web/bundles/ +/web/images/* +/web/spritesheets/* +/web/atelierspierrot/* +/web/js/* +/web/css/* + /setup /frontend /data/files/FootprintAttachment/* @@ -22,21 +50,7 @@ theme/sass/.sass-cache/ /reports /nbproject/ partkeepr.jsfiles -app/authkey.php -app/config/parameters.php -app/config/parameters_setup.php -/web/bundles/ -/web/images/* -/web/spritesheets/* -/web/atelierspierrot/* -/web/js/* -/web/css/* -/app/bootstrap.php.cache -/app/cache/* -/app/config/parameters.yml -/app/logs/* -/vendor/ /bin/ /composer.phar From dd75dba601d940d77b3f3324138fe6b43afd5fe2 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 May 2021 16:14:24 +0200 Subject: [PATCH 101/140] bootstrap vendor/autload --- app/config/config_framework.yml | 3 +++ app/config/config_test.yml | 3 +++ phpunit.xml.dist | 9 +++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/config/config_framework.yml b/app/config/config_framework.yml index 9b2d8cb2b..3617e781c 100644 --- a/app/config/config_framework.yml +++ b/app/config/config_framework.yml @@ -16,6 +16,9 @@ framework: default_locale: "%locale%" trusted_proxies: ~ session: ~ +### http://symfony.com/doc/current/reference/configuration/framework.html#handler-id +## handler_id: session.handler.native_file +## save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" fragments: ~ http_method_override: true cache: diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 5dd8cadf1..61dd54605 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -5,6 +5,9 @@ framework: test: ~ session: storage_id: session.storage.mock_file +### http://symfony.com/doc/current/reference/configuration/framework.html#handler-id +## handler_id: session.handler.native_file +## save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" profiler: enabled: false diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c6fe6703b..ed12578bb 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -11,7 +11,7 @@ processIsolation = "false" stopOnFailure = "false" syntaxCheck = "false" - bootstrap = "bootstrap.php.cache" > + bootstrap = "vendor/autoload.php" > @@ -20,11 +20,9 @@ - - + diff --git a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml index ec74e0209..a40f5b4d8 100644 --- a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml +++ b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml @@ -16,7 +16,7 @@ - + diff --git a/src/PartKeepr/CoreBundle/Resources/config/services.xml b/src/PartKeepr/CoreBundle/Resources/config/services.xml index a14a2a017..071e63d2e 100644 --- a/src/PartKeepr/CoreBundle/Resources/config/services.xml +++ b/src/PartKeepr/CoreBundle/Resources/config/services.xml @@ -22,7 +22,7 @@ - + diff --git a/src/PartKeepr/DoctrineReflectionBundle/Resources/config/services.xml b/src/PartKeepr/DoctrineReflectionBundle/Resources/config/services.xml index 1256cc5e7..d233dc6b5 100644 --- a/src/PartKeepr/DoctrineReflectionBundle/Resources/config/services.xml +++ b/src/PartKeepr/DoctrineReflectionBundle/Resources/config/services.xml @@ -18,7 +18,7 @@ - + diff --git a/src/PartKeepr/ImportBundle/Controller/ImportController.php b/src/PartKeepr/ImportBundle/Controller/ImportController.php index 4dba2a903..5104d8f95 100644 --- a/src/PartKeepr/ImportBundle/Controller/ImportController.php +++ b/src/PartKeepr/ImportBundle/Controller/ImportController.php @@ -79,7 +79,7 @@ public function importAction(Request $request) protected function extractCSVData($tempFileIRI, $includeHeaders = true) { - $tempUploadedFile = $this->get("api.iri_converter")->getItemFromIri($tempFileIRI); + $tempUploadedFile = $this->get("api_platform.iri_converter")->getItemFromIri($tempFileIRI); $fileContents = $this->get('partkeepr_uploadedfile_service')->getStorage($tempUploadedFile)->read($tempUploadedFile->getFullFilename()); $tempFile = tempnam(sys_get_temp_dir(), "import"); diff --git a/src/PartKeepr/ImportBundle/Resources/config/services.xml b/src/PartKeepr/ImportBundle/Resources/config/services.xml index ae10f1fd9..e791e7094 100644 --- a/src/PartKeepr/ImportBundle/Resources/config/services.xml +++ b/src/PartKeepr/ImportBundle/Resources/config/services.xml @@ -9,7 +9,7 @@ - + diff --git a/src/PartKeepr/PartBundle/Controller/PartController.php b/src/PartKeepr/PartBundle/Controller/PartController.php index add786ae5..c0bd399a2 100644 --- a/src/PartKeepr/PartBundle/Controller/PartController.php +++ b/src/PartKeepr/PartBundle/Controller/PartController.php @@ -28,7 +28,7 @@ public function massRemoveStockAction(Request $request) /** * @var IriConverter */ - $iriConverter = $this->get('api.iri_converter'); + $iriConverter = $this->get('api_platform.iri_converter'); $removals = json_decode($request->get('removals')); diff --git a/tests/AuthBundle/UserTest.php b/tests/AuthBundle/UserTest.php index d730b8413..fc6c954c1 100644 --- a/tests/AuthBundle/UserTest.php +++ b/tests/AuthBundle/UserTest.php @@ -64,7 +64,7 @@ public function testChangeUserPassword() $client = static::makeClient(true); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($user); $client->request('GET', $iri); @@ -103,7 +103,7 @@ public function testSelfChangeUserPassword() ] ); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($user).'/changePassword'; $parameters = [ @@ -156,7 +156,7 @@ public function testUserProtect() $client = static::makeClient(true); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($user); $data = [ @@ -225,7 +225,7 @@ public function testUserWithPreferencesDeletion() $userPreferenceService->setPreference($user, 'foo', 'bar'); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($user); $client->request('DELETE', $iri); diff --git a/tests/CategoryBundle/AbstractCategoryCreateTest.php b/tests/CategoryBundle/AbstractCategoryCreateTest.php index 075e50a73..480b542e4 100644 --- a/tests/CategoryBundle/AbstractCategoryCreateTest.php +++ b/tests/CategoryBundle/AbstractCategoryCreateTest.php @@ -31,7 +31,7 @@ public function testCreateCategory() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $request = [ 'parent' => $iriConverter->getIriFromItem($rootCategory), @@ -70,7 +70,7 @@ public function testCreateRootCategory() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $request = [ 'name' => 'test', diff --git a/tests/CategoryBundle/AbstractMoveCategoryTest.php b/tests/CategoryBundle/AbstractMoveCategoryTest.php index 4aa5edd60..83de06bea 100644 --- a/tests/CategoryBundle/AbstractMoveCategoryTest.php +++ b/tests/CategoryBundle/AbstractMoveCategoryTest.php @@ -37,7 +37,7 @@ public function testMoveCategory() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($secondCategory); $iri .= '/move'; diff --git a/tests/CoreBundle/SystemNoticeTest.php b/tests/CoreBundle/SystemNoticeTest.php index 8266a21eb..1bb52fcc7 100644 --- a/tests/CoreBundle/SystemNoticeTest.php +++ b/tests/CoreBundle/SystemNoticeTest.php @@ -21,7 +21,7 @@ public function testSystemNotices() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($notice); $ackIri = $iri.'/acknowledge'; diff --git a/tests/DoctrineReflectionBundle/AdvancedSearchFilterTest.php b/tests/DoctrineReflectionBundle/AdvancedSearchFilterTest.php index e7b4f3c8d..97d589adc 100644 --- a/tests/DoctrineReflectionBundle/AdvancedSearchFilterTest.php +++ b/tests/DoctrineReflectionBundle/AdvancedSearchFilterTest.php @@ -56,7 +56,7 @@ public function testEqualFilter() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $this->assertEquals( $iriConverter->getIriFromItem($this->fixtures->getReference("part.1")), @@ -93,7 +93,7 @@ public function testEqualFilterSame() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $this->assertEquals( $iriConverter->getIriFromItem($this->fixtures->getReference("part.1")), @@ -108,7 +108,7 @@ public function testIDReference() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $filter = [ [ @@ -139,7 +139,7 @@ public function testIDReferenceArray() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $filter = [ [ diff --git a/tests/ImageBundle/ImageControllerTest.php b/tests/ImageBundle/ImageControllerTest.php index 59a615655..148435062 100644 --- a/tests/ImageBundle/ImageControllerTest.php +++ b/tests/ImageBundle/ImageControllerTest.php @@ -47,7 +47,7 @@ public function testGetImage() $this->assertEquals(51, $imageSize[0]); $this->assertEquals(23, $imageSize[1]); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $image = $iriConverter->getItemFromIri($imageId); diff --git a/tests/PartBundle/InternalPartNumberTest.php b/tests/PartBundle/InternalPartNumberTest.php index c732e9e9d..3560a9ee1 100644 --- a/tests/PartBundle/InternalPartNumberTest.php +++ b/tests/PartBundle/InternalPartNumberTest.php @@ -34,7 +34,7 @@ public function testInternalPartNumberUniqueness() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $part = [ "name" => "foobar", diff --git a/tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php b/tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php index 54b8714af..2e04a1697 100644 --- a/tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php +++ b/tests/PartBundle/Issues/DistributorAndManufacturerSearchTest.php @@ -59,7 +59,7 @@ public function testManufacturerFilter() $filter = [ 'property' => 'manufacturers.manufacturer', 'operator' => '=', - 'value' => $this->getContainer()->get('api.iri_converter')->getIriFromItem($manufacturer), + 'value' => $this->getContainer()->get('api_platform.iri_converter')->getIriFromItem($manufacturer), ]; $filters = [$filter]; @@ -67,7 +67,7 @@ public function testManufacturerFilter() $client = static::makeClient(true); $partResource = $this->getContainer()->get('resource.part'); - $iri = $this->getContainer()->get('api.iri_converter')->getIriFromResource($partResource); + $iri = $this->getContainer()->get('api_platform.iri_converter')->getIriFromResource($partResource); $client->request('GET', $iri, ['filter' => json_encode($filters)]); @@ -99,7 +99,7 @@ public function testDistributorFilter() $filter = [ 'property' => 'distributors.distributor', 'operator' => '=', - 'value' => $this->getContainer()->get('api.iri_converter')->getIriFromItem($distributor), + 'value' => $this->getContainer()->get('api_platform.iri_converter')->getIriFromItem($distributor), ]; $filters = [$filter]; @@ -107,7 +107,7 @@ public function testDistributorFilter() $client = static::makeClient(true); $partResource = $this->getContainer()->get('resource.part'); - $iri = $this->getContainer()->get('api.iri_converter')->getIriFromResource($partResource); + $iri = $this->getContainer()->get('api_platform.iri_converter')->getIriFromResource($partResource); $client->request('GET', $iri, ['filter' => json_encode($filters)]); diff --git a/tests/PartBundle/Issues/StockHistoryLostTest.php b/tests/PartBundle/Issues/StockHistoryLostTest.php index d0a190e4c..13dc54107 100644 --- a/tests/PartBundle/Issues/StockHistoryLostTest.php +++ b/tests/PartBundle/Issues/StockHistoryLostTest.php @@ -56,7 +56,7 @@ public function testStockHistory() $this->getContainer()->get('doctrine.orm.default_entity_manager')->flush(); - $iriCoverter = $this->getContainer()->get('api.iri_converter'); + $iriCoverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriCoverter->getIriFromItem($part1); $client->request('GET', $iri); diff --git a/tests/PartBundle/StockTest.php b/tests/PartBundle/StockTest.php index ca3231e76..b144c7ecb 100644 --- a/tests/PartBundle/StockTest.php +++ b/tests/PartBundle/StockTest.php @@ -53,7 +53,7 @@ public function testAddStock() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($part); $iri .= '/addStock'; @@ -92,7 +92,7 @@ public function testRemoveStock() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($part); $iri .= '/removeStock'; @@ -130,7 +130,7 @@ public function testSetStock() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($part); $iri .= '/setStock'; diff --git a/tests/ProjectBundle/ProjectTest.php b/tests/ProjectBundle/ProjectTest.php index ccc0c867a..b77f9ebf4 100644 --- a/tests/ProjectBundle/ProjectTest.php +++ b/tests/ProjectBundle/ProjectTest.php @@ -145,7 +145,7 @@ public function testProjectPartRemoval() 'jsonld' ); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($project); $client->request( @@ -192,7 +192,7 @@ public function testProjectAttachmentRemoval() 'jsonld' ); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($project); $client->request( @@ -227,7 +227,7 @@ public function testAbsentProjectReference() $project = $this->fixtures->getReference('project'); - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($project); $client->request( diff --git a/tests/TipOfTheDayBundle/TipOfTheDayTest.php b/tests/TipOfTheDayBundle/TipOfTheDayTest.php index 0e44bc2a2..4fd1b28cc 100644 --- a/tests/TipOfTheDayBundle/TipOfTheDayTest.php +++ b/tests/TipOfTheDayBundle/TipOfTheDayTest.php @@ -32,7 +32,7 @@ public function testTips() /** * @var IriConverter */ - $iriConverter = $this->getContainer()->get('api.iri_converter'); + $iriConverter = $this->getContainer()->get('api_platform.iri_converter'); $iri = $iriConverter->getIriFromItem($tip); $iri .= '/markTipRead'; From 566db06b8d7933035f2b8926b26d42aa68d82217 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 11:13:20 +0200 Subject: [PATCH 108/140] FOS\RestBundle ParamFetcher service changes ? --- .../Controller/DefaultController.php | 2 +- .../RESTBundle/Resources/config/request.xml | 23 +++++++++++++------ .../Controller/StatisticController.php | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Controller/DefaultController.php b/src/PartKeepr/AuthBundle/Controller/DefaultController.php index 35297c2af..964cfd8c6 100644 --- a/src/PartKeepr/AuthBundle/Controller/DefaultController.php +++ b/src/PartKeepr/AuthBundle/Controller/DefaultController.php @@ -6,7 +6,7 @@ use FOS\RestBundle\Controller\Annotations\RequestParam; use FOS\RestBundle\Controller\Annotations\View; use FOS\RestBundle\Controller\FOSRestController; -use FOS\RestBundle\Request\ParamFetcher; +use FOS\RestBundle\Request\ParamFetcherInterface; use PartKeepr\AuthBundle\Entity\FOSUser; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\AuthBundle\Validator\Constraints\Username; diff --git a/src/PartKeepr/RESTBundle/Resources/config/request.xml b/src/PartKeepr/RESTBundle/Resources/config/request.xml index 9c652dbf8..fae5f93b6 100644 --- a/src/PartKeepr/RESTBundle/Resources/config/request.xml +++ b/src/PartKeepr/RESTBundle/Resources/config/request.xml @@ -1,25 +1,34 @@ - - - FOS\RestBundle\Request\ParamFetcher + FOS\RestBundle\Request\ParamFetcherInterface PartKeepr\RESTBundle\Request\ParamReader - - + + + + - - + + + + + + + + + + + diff --git a/src/PartKeepr/StatisticBundle/Controller/StatisticController.php b/src/PartKeepr/StatisticBundle/Controller/StatisticController.php index 445e6f66f..e0931e8e6 100644 --- a/src/PartKeepr/StatisticBundle/Controller/StatisticController.php +++ b/src/PartKeepr/StatisticBundle/Controller/StatisticController.php @@ -5,7 +5,7 @@ use FOS\RestBundle\Controller\Annotations\QueryParam; use FOS\RestBundle\Controller\Annotations\View; use FOS\RestBundle\Controller\FOSRestController; -use FOS\RestBundle\Request\ParamFetcher; +use FOS\RestBundle\Request\ParamFetcherInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration as Routing; class StatisticController extends FOSRestController From 9ac2e81f3710767d9cfd6b26334d88aa19607a21 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 11:34:45 +0200 Subject: [PATCH 109/140] correct api. to api_platform. --- app/config/parameters.php.dist | 2 +- .../AuthBundle/Resources/config/actions.xml | 22 +++++++++------ .../Resources/config/actions.xml | 4 ++- .../Resources/config/actions.xml | 4 ++- .../CoreBundle/Resources/config/actions.xml | 4 ++- .../CoreBundle/Resources/config/services.xml | 6 ++-- .../Compiler/CsvFormatPass.php | 2 +- .../Compiler/XmlExcelFormatPass.php | 2 +- .../Resources/config/actions.xml | 4 ++- .../PartBundle/Resources/config/actions.xml | 28 +++++++++++++------ .../Controller/ProjectReportController.php | 2 +- .../Services/ConfigSetupService.php | 2 +- .../Resources/config/actions.xml | 4 +-- .../Resources/config/actions.xml | 8 ++++-- .../AbstractCategoryCreateTest.php | 4 +-- 15 files changed, 65 insertions(+), 33 deletions(-) diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist index 9f29a4f61..c6b71bb34 100644 --- a/app/config/parameters.php.dist +++ b/app/config/parameters.php.dist @@ -192,7 +192,7 @@ $container->setParameter('partkeepr.filesystem.quota', false); /** * Specifies the dunglas cache. Defaults to false. - * You can use the APCu cache by specifying "api.mapping.cache.apc" here. + * You can use the APCu cache by specifying "api_platform.mapping.cache.apc" here. * * Further reading: https://api-platform.com/doc/1.0/api-bundle/performances */ diff --git a/src/PartKeepr/AuthBundle/Resources/config/actions.xml b/src/PartKeepr/AuthBundle/Resources/config/actions.xml index e1dec2598..6ac9380f3 100644 --- a/src/PartKeepr/AuthBundle/Resources/config/actions.xml +++ b/src/PartKeepr/AuthBundle/Resources/config/actions.xml @@ -9,12 +9,12 @@ class="PartKeepr\AuthBundle\Action\GetPreferencesAction"> - + - + @@ -22,23 +22,29 @@ - - + + + + - - + + + + - + + + - + diff --git a/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml b/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml index f4b65622f..c9980a457 100644 --- a/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml +++ b/src/PartKeepr/BatchJobBundle/Resources/config/actions.xml @@ -6,7 +6,9 @@ - + + + diff --git a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml index a40f5b4d8..05ea33ae3 100644 --- a/src/PartKeepr/CategoryBundle/Resources/config/actions.xml +++ b/src/PartKeepr/CategoryBundle/Resources/config/actions.xml @@ -15,7 +15,9 @@ - + + + diff --git a/src/PartKeepr/CoreBundle/Resources/config/actions.xml b/src/PartKeepr/CoreBundle/Resources/config/actions.xml index fc11a8459..cfc4b001e 100644 --- a/src/PartKeepr/CoreBundle/Resources/config/actions.xml +++ b/src/PartKeepr/CoreBundle/Resources/config/actions.xml @@ -7,7 +7,9 @@ - + + + diff --git a/src/PartKeepr/CoreBundle/Resources/config/services.xml b/src/PartKeepr/CoreBundle/Resources/config/services.xml index 071e63d2e..a6971e8af 100644 --- a/src/PartKeepr/CoreBundle/Resources/config/services.xml +++ b/src/PartKeepr/CoreBundle/Resources/config/services.xml @@ -20,8 +20,10 @@ - - + + + + diff --git a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php index 01e8295aa..4f34b29f4 100644 --- a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php +++ b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php @@ -9,7 +9,7 @@ class CsvFormatPass implements CompilerPassInterface { /* before - + now diff --git a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php index 52ef98b8f..c6fd8481f 100644 --- a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php +++ b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php @@ -9,7 +9,7 @@ class XmlExcelFormatPass implements CompilerPassInterface { /* before - + now diff --git a/src/PartKeepr/FrontendBundle/Resources/config/actions.xml b/src/PartKeepr/FrontendBundle/Resources/config/actions.xml index 3b079adac..26ed6de44 100644 --- a/src/PartKeepr/FrontendBundle/Resources/config/actions.xml +++ b/src/PartKeepr/FrontendBundle/Resources/config/actions.xml @@ -8,7 +8,9 @@ - + + + diff --git a/src/PartKeepr/PartBundle/Resources/config/actions.xml b/src/PartKeepr/PartBundle/Resources/config/actions.xml index 0dae731c4..c3032cab7 100644 --- a/src/PartKeepr/PartBundle/Resources/config/actions.xml +++ b/src/PartKeepr/PartBundle/Resources/config/actions.xml @@ -7,43 +7,55 @@ - + - - + + + + - + + + - + + + - + + + - + + + - + + + diff --git a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php index 9c77e6382..4398c441d 100644 --- a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php +++ b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php @@ -36,7 +36,7 @@ public function createReportAction(Request $request) * @var ResourceInterface */ list($resourceType, $format) = $this->extractAttributes($request); - $report = $this->get("api.serializer")->deserialize( + $report = $this->get("api_platform.serializer")->deserialize( $request->getContent(), $resourceType->getEntityClass(), $format, diff --git a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php index 5cfad23f6..e5dc45fe8 100644 --- a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php +++ b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php @@ -88,7 +88,7 @@ public function getConfig($config) ]; if (function_exists('apc_fetch')) { - $parameters['cache.dunglas'] = 'api.mapping.cache.apc'; + $parameters['cache.dunglas'] = 'api_platform.mapping.cache.apc'; $parameters['cache.doctrine'] = 'apc'; } diff --git a/src/PartKeepr/SystemPreferenceBundle/Resources/config/actions.xml b/src/PartKeepr/SystemPreferenceBundle/Resources/config/actions.xml index b960906d6..3bda72290 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Resources/config/actions.xml +++ b/src/PartKeepr/SystemPreferenceBundle/Resources/config/actions.xml @@ -8,11 +8,11 @@ - + - + diff --git a/src/PartKeepr/TipOfTheDayBundle/Resources/config/actions.xml b/src/PartKeepr/TipOfTheDayBundle/Resources/config/actions.xml index 181aa4bcf..86e8c4d95 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Resources/config/actions.xml +++ b/src/PartKeepr/TipOfTheDayBundle/Resources/config/actions.xml @@ -6,7 +6,9 @@ - + + + @@ -17,7 +19,9 @@ - + + + diff --git a/tests/CategoryBundle/AbstractCategoryCreateTest.php b/tests/CategoryBundle/AbstractCategoryCreateTest.php index 480b542e4..1d1956252 100644 --- a/tests/CategoryBundle/AbstractCategoryCreateTest.php +++ b/tests/CategoryBundle/AbstractCategoryCreateTest.php @@ -38,7 +38,7 @@ public function testCreateCategory() 'name' => 'test', ]; - $resource = $this->getContainer()->get('api.resource_collection')->getResourceForEntity($this->getResourceClass()); + $resource = $this->getContainer()->get('api_platform.resource_collection')->getResourceForEntity($this->getResourceClass()); $iri = $iriConverter->getIriFromResource($resource); $client->request( @@ -76,7 +76,7 @@ public function testCreateRootCategory() 'name' => 'test', ]; - $resource = $this->getContainer()->get('api.resource_collection')->getResourceForEntity($this->getResourceClass()); + $resource = $this->getContainer()->get('api_platform.resource_collection')->getResourceForEntity($this->getResourceClass()); $iri = $iriConverter->getIriFromResource($resource); $client->request( From bab93683c2904526bf792f2476d63b2466100340 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 12:10:17 +0200 Subject: [PATCH 110/140] remove fr3d/ldap-bundle (with zendframework/zend-stdlib,zend-ldap,zend-hydrator) parameters to be removed later --- app/AppKernel.php | 7 +- app/config/security.yml | 6 +- composer.json | 3 +- composer.lock | 828 +++++++++++++++++++--------------------- 4 files changed, 397 insertions(+), 447 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index e24676e5d..e1c568e0b 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -16,7 +16,7 @@ public function registerBundles() new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), -// new Symfony\Bundle\AsseticBundle\AsseticBundle(), + new Symfony\Bundle\AsseticBundle\AsseticBundle(), new FOS\RestBundle\FOSRestBundle(), new FOS\UserBundle\FOSUserBundle(), new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), @@ -29,9 +29,8 @@ public function registerBundles() new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(), new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(), new \PartKeepr\RemoteFileLoader\PartKeeprRemoteFileLoaderBundle(), - new \FR3D\LdapBundle\FR3DLdapBundle(), - new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle() -// new AppBundle\AppBundle(), + new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(), +// new AppBundle\AppBundle(), ]; // Developer bundles diff --git a/app/config/security.yml b/app/config/security.yml index 3f0253515..d0bad84b0 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -18,15 +18,13 @@ security: providers: chain_provider: chain: - providers: [in_memory, fos_userbundle, fr3d_ldapbundle, legacy] + providers: [in_memory, fos_userbundle, legacy] legacy: id: partkeepr_legacy_user_provider in_memory: memory: ~ fos_userbundle: id: fos_user.user_provider.username - fr3d_ldapbundle: - id: fr3d_ldap.security.user.provider firewalls: login: @@ -38,8 +36,6 @@ security: pattern: ^/api/.* #symf 3 ? path: ^/api/.* provider: chain_provider - fr3d_ldap_httpbasic: - provider: chain_provider http_basic: provider: chain_provider remote_user: diff --git a/composer.json b/composer.json index b6665899c..4398f4dab 100755 --- a/composer.json +++ b/composer.json @@ -75,7 +75,6 @@ "api-platform/core": "dev-main", "escapestudios/wsse-authentication-bundle": "2.3.0", - "fr3d/ldap-bundle": "v3.0.2", "nfq-alpha/sprite-bundle": "dev-min-image-fix", "partkeepr/extjs6": "dev-master", "partkeepr/remote-file-loader": "dev-master", @@ -116,7 +115,7 @@ }, "config": { "platform": { - "php": ">=7.1.0" + "php": "7.3.28" } }, "extra": { diff --git a/composer.lock b/composer.lock index 51665e912..fe356f1cf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2ab5b65a8acba78137a99b94a504d80a", + "content-hash": "4685ff0a844854ec60be33c942ae464e", "packages": [ { "name": "api-platform/core", @@ -344,35 +344,32 @@ }, { "name": "doctrine/annotations", - "version": "1.11.1", + "version": "1.14.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad" + "reference": "03cb2123a67d4be806554fe670d0adc298199808" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad", - "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/03cb2123a67d4be806554fe670d0adc298199808", + "reference": "03cb2123a67d4be806554fe670d0adc298199808", "shasum": "" }, "require": { "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "1.*", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^9.1.5" + "phpunit/phpunit": "^7.5 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" @@ -411,44 +408,43 @@ "docblock", "parser" ], - "time": "2020-10-26T10:28:16+00:00" + "time": "2021-04-29T07:39:39+00:00" }, { "name": "doctrine/cache", - "version": "1.10.2", + "version": "1.11.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "13e3381b25847283a91948d04640543941309727" + "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727", - "reference": "13e3381b25847283a91948d04640543941309727", + "url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0", + "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0", "shasum": "" }, "require": { "php": "~7.1 || ^8.0" }, "conflict": { - "doctrine/common": ">2.2,<2.4" + "doctrine/common": ">2.2,<2.4", + "psr/cache": ">=3" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^6.0", + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^8.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "predis/predis": "~1.0", + "psr/cache": "^1.0 || ^2.0", + "symfony/cache": "^4.4 || ^5.2" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" @@ -507,30 +503,30 @@ "type": "tidelift" } ], - "time": "2020-07-07T18:54:01+00:00" + "time": "2021-04-13T14:46:17+00:00" }, { "name": "doctrine/collections", - "version": "1.6.7", + "version": "1.7.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a" + "reference": "436a4eb4535f141c6c52a3099016cb22ceca05b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a", - "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a", + "url": "https://api.github.com/repos/doctrine/collections/zipball/436a4eb4535f141c6c52a3099016cb22ceca05b5", + "reference": "436a4eb4535f141c6c52a3099016cb22ceca05b5", "shasum": "" }, "require": { "php": "^7.1.3 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan-shim": "^0.9.2", - "phpunit/phpunit": "^7.0", - "vimeo/psalm": "^3.8.1" + "doctrine/coding-standard": "^6.0 || ^8.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", + "vimeo/psalm": "^4.2.1" }, "type": "library", "autoload": { @@ -572,20 +568,20 @@ "iterators", "php" ], - "time": "2020-07-27T17:53:49+00:00" + "time": "2021-02-10T21:28:26+00:00" }, { "name": "doctrine/common", - "version": "v2.8.1", + "version": "2.8.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66" + "reference": "09140dc44c8fde67cf2c676f6e063406404f032f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66", - "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66", + "url": "https://api.github.com/repos/doctrine/common/zipball/09140dc44c8fde67cf2c676f6e063406404f032f", + "reference": "09140dc44c8fde67cf2c676f6e063406404f032f", "shasum": "" }, "require": { @@ -645,7 +641,7 @@ "persistence", "spl" ], - "time": "2017-08-31T08:43:38+00:00" + "time": "2017-08-31T08:48:09+00:00" }, { "name": "doctrine/data-fixtures", @@ -1079,33 +1075,38 @@ }, { "name": "doctrine/inflector", - "version": "1.3.1", + "version": "1.4.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^8.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -1134,15 +1135,35 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], + "time": "2021-04-16T17:34:40+00:00" }, { "name": "doctrine/instantiator", @@ -1211,30 +1232,27 @@ }, { "name": "doctrine/lexer", - "version": "1.0.2", + "version": "1.3.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" + "reference": "59bfb3b9be04237be4cd1afea9bbb58794c25ce8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", - "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/59bfb3b9be04237be4cd1afea9bbb58794c25ce8", + "reference": "59bfb3b9be04237be4cd1afea9bbb58794c25ce8", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.5" + "doctrine/coding-standard": "^8.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8.2 || ^9.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" @@ -1245,14 +1263,14 @@ "MIT" ], "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, { "name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com" }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" @@ -1267,7 +1285,21 @@ "parser", "php" ], - "time": "2019-06-08T11:03:04+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2021-01-20T07:15:06+00:00" }, { "name": "doctrine/migrations", @@ -1494,19 +1526,15 @@ }, "require": { "doctrine/common": "~2.2", - "php": ">=5.3.2", - "symfony/framework-bundle": "~3.3", - "symfony/security-bundle": "~3.3" + "php": ">=5.3.9", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/security-bundle": "~2.3|~3.0" }, "require-dev": { - "symfony/finder": "~3.3" + "symfony/finder": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, "autoload": { "psr-0": { "Escape\\WSSEAuthenticationBundle": "" @@ -1518,7 +1546,7 @@ "authors": [ { "name": "David Joos", - "email": "david@escapestudios.com" + "email": "david.joos@escapestudios.com" }, { "name": "Community contributors", @@ -1533,9 +1561,10 @@ "wsse" ], "support": { - "source": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/tree/PSR3Logging" + "source": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/tree/2.3.0", + "issues": "https://github.com/djoos/EscapeWSSEAuthenticationBundle/issues" }, - "time": "2016-01-03T15:44:13+00:00" + "time": "2018-02-08T14:04:44+00:00" }, { "name": "fortawesome/font-awesome", @@ -1600,72 +1629,9 @@ ], "time": "2020-10-05T16:44:11+00:00" }, - { - "name": "fr3d/ldap-bundle", - "version": "v3.0.2", - "source": { - "type": "git", - "url": "https://github.com/Maks3w/FR3DLdapBundle.git", - "reference": "2309156974e02a8a1398fe491627e1a84da39e67" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Maks3w/FR3DLdapBundle/zipball/2309156974e02a8a1398fe491627e1a84da39e67", - "reference": "2309156974e02a8a1398fe491627e1a84da39e67", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "psr/log": "~1.0", - "symfony/config": "2.3 - 3", - "symfony/dependency-injection": "2.3 - 3", - "symfony/polyfill-php56": "^1.1", - "symfony/security": "2.3 - 3", - "symfony/security-bundle": "2.3 - 3", - "zendframework/zend-ldap": "2.5 - 3" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.11.*", - "fr3d/psr3-message-assertions": "0.1.*", - "friendsofsymfony/user-bundle": "~1.3", - "maks3w/phpunit-methods-trait": "^4.6", - "phpunit/phpunit": "^4.6", - "symfony/validator": "2.3 - 3" - }, - "suggest": { - "friendsofsymfony/user-bundle": "Integrate authentication and management for DB users, useful for unmanaged LDAP servers", - "symfony/validator": "Allow pre-validate for existing users before register new ones" - }, - "type": "symfony-bundle", - "autoload": { - "psr-4": { - "FR3D\\LdapBundle\\": "" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maks3w" - } - ], - "description": "This package provide users and authentication services based on LDAP directories for Symfony2 framework", - "homepage": "https://github.com/Maks3w/FR3DLdapBundle", - "keywords": [ - "authentication", - "ldap" - ], - "support": { - "issues": "https://github.com/Maks3w/FR3DLdapBundle/issues", - "source": "https://github.com/Maks3w/FR3DLdapBundle" - }, - "time": "2015-11-02T22:02:23+00:00" - }, { "name": "friendsofsymfony/rest-bundle", "version": "2.0.1", - "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", @@ -1709,20 +1675,21 @@ "symfony/yaml": "^2.7|^3.0" }, "suggest": { - "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0", - "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ~3.0", - "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.3", - "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.3" + "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^1.0", + "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ^3.0", + "symfony/expression-language": "Add support for using the expression language in the routing, requires ^2.7|^3.0", + "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ^2.7|^3.0", + "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ^2.7|^3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "2.0-dev" } }, "autoload": { - "psr-0": { - "FOS\\RestBundle": "" + "psr-4": { + "FOS\\RestBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1748,7 +1715,7 @@ "keywords": [ "rest" ], - "time": "2015-12-29T16:02:50+00:00" + "time": "2016-09-07T15:10:30+00:00" }, { "name": "friendsofsymfony/user-bundle", @@ -2608,26 +2575,32 @@ }, "require": { "michelf/php-markdown": "~1.4", + "php": ">=5.4", "symfony/console": "~2.3|~3.0|~4.0", "symfony/framework-bundle": "~2.3|~3.0|~4.0", "symfony/twig-bundle": "~2.3|~3.0|~4.0" }, "conflict": { "jms/serializer": "<0.12", - "jms/serializer-bundle": "<0.11" + "jms/serializer-bundle": "<0.11", + "symfony/symfony": "~2.7.8", + "twig/twig": "<1.12" }, "require-dev": { - "friendsofsymfony/rest-bundle": "~1.0", + "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "~2.3", + "dunglas/api-bundle": "~1.0", + "friendsofsymfony/rest-bundle": "~1.0|~2.0", "jms/serializer-bundle": ">=0.11", "sensio/framework-extra-bundle": "~3.0", - "symfony/browser-kit": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/finder": "~2.3", - "symfony/form": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/serializer": "~2.7", - "symfony/validator": "~2.3", - "symfony/yaml": "~2.3" + "symfony/browser-kit": "~2.3|~3.0|~4.0", + "symfony/css-selector": "~2.3|~3.0|~4.0", + "symfony/finder": "~2.3|~3.0|~4.0", + "symfony/form": "~2.3|~3.0|~4.0", + "symfony/phpunit-bridge": "~2.7|~3.0|~4.0", + "symfony/serializer": "~2.7|~3.0|~4.0", + "symfony/validator": "~2.3|~3.0|~4.0", + "symfony/yaml": "~2.3|~3.0|~4.0" }, "suggest": { "dunglas/api-bundle": "For making use of resources definitions of DunglasApiBundle.", @@ -2639,7 +2612,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.9.x-dev" + "dev-2.x": "2.13-dev" } }, "autoload": { @@ -2668,7 +2641,7 @@ "documentation", "rest" ], - "time": "2015-09-30T21:35:45+00:00" + "time": "2021-03-23T07:09:33+00:00" }, { "name": "nfq-alpha/sprite-bundle", @@ -3041,35 +3014,36 @@ "shasum": "" }, "require": { - "willdurand/negotiation": "^2.0.3" - }, - "require-dev": { - "psr/log": "^1.0" + "php": ">=5.3.0" }, - "type": "psr/cache", + "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "ApiPlatform\\Core\\": "src/" + "Psr\\Cache\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "authors": [ { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com", - "homepage": "http://dunglas.fr" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "JSON-LD / Hydra REST API for Symfony", - "homepage": "http://api-platform.com", + "description": "Common interface for caching libraries", "keywords": [ - "rest" + "cache", + "psr", + "psr-6" ], - "time": "2015-09-23T13:09:28+00:00" + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/container", @@ -3172,22 +3146,30 @@ }, { "name": "psr/log", - "version": "1.0.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3197,16 +3179,17 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21T11:40:51+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "psr/simple-cache", @@ -3447,11 +3430,6 @@ "symfony/http-kernel": "~2.3|~3.0", "symfony/process": "~2.3|~3.0" }, - "suggest": { - "symfony/form": "If you want to use the configurator", - "symfony/validator": "If you want to use the configurator", - "symfony/yaml": "If you want to use the configurator" - }, "type": "symfony-bundle", "extra": { "branch-alias": { @@ -3479,7 +3457,7 @@ "distribution" ], "abandoned": true, - "time": "2019-06-18T15:41:34+00:00" + "time": "2019-06-18T15:43:58+00:00" }, { "name": "sensio/framework-extra-bundle", @@ -3567,7 +3545,7 @@ }, "require": { "php": ">=7.1.3", - "symfony/console": "^2.8|^3.3|^3.4|^4.2|^5.0", + "symfony/console": "^2.8|^3.4|^4.2|^5.0", "symfony/http-client": "^4.3|^5.0", "symfony/mime": "^4.3|^5.0", "symfony/polyfill-ctype": "^1.11" @@ -4252,15 +4230,15 @@ "require": { "monolog/monolog": "~1.22", "php": ">=5.6", - "symfony/config": "~2.7|~3.3|~4.0", - "symfony/dependency-injection": "~2.7|~3.4.10|^4.0.10", - "symfony/http-kernel": "~2.7|~3.3|~4.0", - "symfony/monolog-bridge": "~2.7|~3.3|~4.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4.10|^4.0.10", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/monolog-bridge": "~3.4|~4.0" }, "require-dev": { - "symfony/console": "~2.7|~3.3|~4.0", - "symfony/phpunit-bridge": "^3.3|^4.0", - "symfony/yaml": "~2.7|~3.3|~4.0" + "symfony/console": "~3.4|~4.0", + "symfony/phpunit-bridge": "^3.4.19|^4.0", + "symfony/yaml": "~3.4|~4.0" }, "type": "symfony-bundle", "extra": { @@ -4296,20 +4274,20 @@ "log", "logging" ], - "time": "2018-11-04T09:58:13+00:00" + "time": "2019-06-20T12:18:19+00:00" }, { "name": "symfony/polyfill-apcu", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "f5191eb0e98e08d12eb49fc0ed0820e37de89fdf" + "reference": "80f7fb64c5b64ebcba76f40215e63808a2062a18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/f5191eb0e98e08d12eb49fc0ed0820e37de89fdf", - "reference": "f5191eb0e98e08d12eb49fc0ed0820e37de89fdf", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/80f7fb64c5b64ebcba76f40215e63808a2062a18", + "reference": "80f7fb64c5b64ebcba76f40215e63808a2062a18", "shasum": "" }, "require": { @@ -4318,7 +4296,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4370,20 +4348,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -4395,7 +4373,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4446,7 +4424,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-iconv", @@ -4527,29 +4505,28 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "c44d5bf6a75eed79555c6bf37505c6d39559353e" + "reference": "d76a2aba89a14405e288ea47598e91e304c3e120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/c44d5bf6a75eed79555c6bf37505c6d39559353e", - "reference": "c44d5bf6a75eed79555c6bf37505c6d39559353e", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/d76a2aba89a14405e288ea47598e91e304c3e120", + "reference": "d76a2aba89a14405e288ea47598e91e304c3e120", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/intl": "~2.3|~3.0|~4.0|~5.0" + "php": ">=7.1" }, "suggest": { - "ext-intl": "For best performance" + "ext-intl": "For best performance and support of other locales than \"en\"" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4559,6 +4536,15 @@ "autoload": { "files": [ "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Icu\\": "" + }, + "classmap": [ + "Resources/stubs" + ], + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4599,7 +4585,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-04-19T09:48:16+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -4768,16 +4754,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" + "reference": "9ad2f3c9de0273812c616fdf96070a129c3defcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9ad2f3c9de0273812c616fdf96070a129c3defcb", + "reference": "9ad2f3c9de0273812c616fdf96070a129c3defcb", "shasum": "" }, "require": { @@ -4789,7 +4775,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4841,11 +4827,11 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-04-23T08:04:02+00:00" }, { "name": "symfony/polyfill-php54", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", @@ -4910,7 +4896,7 @@ }, { "name": "symfony/polyfill-php55", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", @@ -4975,7 +4961,7 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", @@ -5040,7 +5026,7 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -5254,16 +5240,16 @@ }, { "name": "symfony/polyfill-util", - "version": "v1.20.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "fd2008fac0a11ae100537406d95887d5a9155e4f" + "reference": "f2a03e0938d3e4feabf63db6300da01b01cfa00e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/fd2008fac0a11ae100537406d95887d5a9155e4f", - "reference": "fd2008fac0a11ae100537406d95887d5a9155e4f", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/f2a03e0938d3e4feabf63db6300da01b01cfa00e", + "reference": "f2a03e0938d3e4feabf63db6300da01b01cfa00e", "shasum": "" }, "require": { @@ -5272,7 +5258,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5320,7 +5306,7 @@ "type": "tidelift" } ], - "time": "2020-10-24T08:53:22+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/security-acl", @@ -5835,12 +5821,15 @@ "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -5854,8 +5843,8 @@ ], "authors": [ { - "name": "William DURAND", - "email": "william.durand1@gmail.com" + "name": "William Durand", + "email": "will+git@drnd.me" } ], "description": "Content Negotiation tools for PHP provided as a standalone library.", @@ -5867,179 +5856,7 @@ "header", "negotiation" ], - "time": "2015-10-01T07:42:40+00:00" - }, - { - "name": "zendframework/zend-hydrator", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0@dev", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-inputfilter": "^2.6", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", - "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage", - "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-1.0": "1.0-dev", - "dev-release-1.1": "1.1-dev", - "dev-master": "2.0-dev", - "dev-develop": "2.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Hydrator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-hydrator", - "keywords": [ - "hydrator", - "zf2" - ], - "abandoned": "laminas/laminas-hydrator", - "time": "2016-02-18T22:38:26+00:00" - }, - { - "name": "zendframework/zend-ldap", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-ldap.git", - "reference": "c647a86224030543401634dbafd514074b49b2b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-ldap/zipball/c647a86224030543401634dbafd514074b49b2b6", - "reference": "c647a86224030543401634dbafd514074b49b2b6", - "shasum": "" - }, - "require": { - "ext-ldap": "*", - "php": ">=5.3.23", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5" - }, - "suggest": { - "zendframework/zend-eventmanager": "Zend\\EventManager component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Ldap\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides support for LDAP operations including but not limited to binding, searching and modifying entries in an LDAP directory", - "homepage": "https://github.com/zendframework/zend-ldap", - "keywords": [ - "ldap", - "zf2" - ], - "abandoned": "laminas/laminas-ldap", - "time": "2015-06-03T15:32:02+00:00" - }, - { - "name": "zendframework/zend-stdlib", - "version": "2.7.7", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f", - "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-hydrator": "~1.1" - }, - "require-dev": { - "athletic/athletic": "~0.1", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-2.7": "2.7-dev", - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" - ], - "abandoned": "laminas/laminas-stdlib", - "time": "2016-04-12T21:17:31+00:00" + "time": "2016-08-30T11:08:41+00:00" } ], "packages-dev": [ @@ -6531,6 +6348,9 @@ "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || ^8.0 || ^9.0", "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, "bin": [ "bin/php-coveralls" ], @@ -6540,21 +6360,7 @@ "PhpCoveralls\\": "src/" } }, - "autoload-dev": { - "psr-4": { - "PhpCoveralls\\Tests\\": "tests/" - } - }, "notification-url": "https://packagist.org/downloads/", - "scripts": { - "install-dev-tools": [ - "cd dev-tools && composer update --no-interaction" - ], - "sca": [ - "php dev-tools/vendor/bin/php-cs-fixer fix --dry-run -vv", - "php dev-tools/vendor/bin/phpmd src text build/config/phpmd.xml" - ] - }, "license": [ "MIT" ], @@ -6562,19 +6368,35 @@ { "name": "Kitamura Satoshi", "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" + "homepage": "https://www.facebook.com/satooshi.jp", + "role": "Original creator" + }, + { + "name": "Takashi Matsuo", + "email": "tmatsuo@google.com" + }, + { + "name": "Google Inc" + }, + { + "name": "Dariusz Ruminski", + "email": "dariusz.ruminski@gmail.com", + "homepage": "https://github.com/keradus" + }, + { + "name": "Contributors", + "homepage": "https://github.com/php-coveralls/php-coveralls/graphs/contributors" } ], "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/satooshi/php-coveralls", + "homepage": "https://github.com/php-coveralls/php-coveralls", "keywords": [ "ci", "coverage", "github", "test" ], - "abandoned": "php-coveralls/php-coveralls", - "time": "2013-05-04T08:07:33+00:00" + "time": "2020-12-24T09:17:03+00:00" }, { "name": "phpdocumentor/reflection", @@ -7653,6 +7475,137 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, + { + "name": "sensio/generator-bundle", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", + "reference": "28cbaa244bd0816fd8908b93f90380bcd7b67a65" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/28cbaa244bd0816fd8908b93f90380bcd7b67a65", + "reference": "28cbaa244bd0816fd8908b93f90380bcd7b67a65", + "shasum": "" + }, + "require": { + "symfony/console": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0", + "symfony/process": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0", + "twig/twig": "^1.28.2|^2.0" + }, + "require-dev": { + "doctrine/orm": "~2.4", + "symfony/doctrine-bridge": "~2.7|~3.0", + "symfony/filesystem": "~2.7|~3.0", + "symfony/phpunit-bridge": "^3.3" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sensio\\Bundle\\GeneratorBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you", + "abandoned": "symfony/maker-bundle", + "time": "2017-12-07T15:36:41+00:00" + }, + { + "name": "symfony/phpunit-bridge", + "version": "3.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "120273ad5d03a8deee08ca9260e2598f288f2bac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/120273ad5d03a8deee08ca9260e2598f288f2bac", + "reference": "120273ad5d03a8deee08ca9260e2598f288f2bac", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2" + }, + "suggest": { + "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" + }, + "bin": [ + "bin/simple-phpunit" + ], + "type": "symfony-bridge", + "extra": { + "thanks": { + "name": "phpunit/phpunit", + "url": "https://github.com/sebastianbergmann/phpunit" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Bridge\\PhpUnit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony PHPUnit Bridge", + "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-11-13T16:28:59+00:00" + }, { "name": "zendframework/zend-code", "version": "2.6.3", @@ -7776,5 +7729,8 @@ "php": ">=7.1.0" }, "platform-dev": [], + "platform-overrides": { + "php": "7.3.28" + }, "plugin-api-version": "1.1.0" } From f36dedd1dd837524a493e843cffac4d7cb97a59e Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 12:17:05 +0200 Subject: [PATCH 111/140] fr3d ldap parameters removed --- app/config/config.yml | 23 ++--------------------- app/config/config_ldap.yml | 22 ---------------------- app/config/config_setup_test.yml | 1 - 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 app/config/config_ldap.yml diff --git a/app/config/config.yml b/app/config/config.yml index 7a6f54785..06abe64a1 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -6,7 +6,6 @@ imports: - { resource: config_doctrine.yml } - { resource: config_fos_user.yml } - { resource: config_dunglas.yml } - - { resource: config_ldap.yml } - { resource: config_partkeepr.yml } - { resource: config_filesystem.yml } @@ -58,7 +57,8 @@ sensio_framework_extra: twig: exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction' - + cache: false + api_platform: title: "PartKeepr" description: "The PartKeepr REST API" @@ -93,25 +93,6 @@ sprite_generator: imagePositioning: min-image imageGenerator: gd2 -fr3d_ldap: - driver: - host: "%fr3d_ldap.driver.host%" - port: "%fr3d_ldap.driver.port%" - username: "%fr3d_ldap.driver.username%" - password: "%fr3d_ldap.driver.password%" - bindRequiresDn: "%fr3d_ldap.driver.bindRequiresDn%" - baseDn: "%fr3d_ldap.driver.baseDn%" - accountFilterFormat: "%fr3d_ldap.driver.accountFilterFormat%" - optReferrals: "%fr3d_ldap.driver.optReferrals%" - useSsl: "%fr3d_ldap.driver.useSsl%" - useStartTls: "%fr3d_ldap.driver.useStartTls%" - accountCanonicalForm: "%fr3d_ldap.driver.accountCanonicalForm%" - accountDomainName: "%fr3d_ldap.driver.accountDomainName%" - accountDomainNameShort: "%fr3d_ldap.driver.accountDomainNameShort%" - user: - baseDn: "%fr3d_ldap.user.baseDn%" - filter: "%fr3d_ldap.user.filter%" - services: serializer.normalizer.custom: class: Symfony\Component\Serializer\Normalizer\ObjectNormalizer diff --git a/app/config/config_ldap.yml b/app/config/config_ldap.yml deleted file mode 100644 index b3d97f826..000000000 --- a/app/config/config_ldap.yml +++ /dev/null @@ -1,22 +0,0 @@ -fr3d_ldap: - driver: - host: "%fr3d_ldap.driver.host%" - port: "%fr3d_ldap.driver.port%" - username: "%fr3d_ldap.driver.username%" - password: "%fr3d_ldap.driver.password%" - bindRequiresDn: "%fr3d_ldap.driver.bindRequiresDn%" - baseDn: "%fr3d_ldap.driver.baseDn%" - accountFilterFormat: "%fr3d_ldap.driver.accountFilterFormat%" - optReferrals: "%fr3d_ldap.driver.optReferrals%" - useSsl: "%fr3d_ldap.driver.useSsl%" - useStartTls: "%fr3d_ldap.driver.useStartTls%" - accountCanonicalForm: "%fr3d_ldap.driver.accountCanonicalForm%" - accountDomainName: "%fr3d_ldap.driver.accountDomainName%" - accountDomainNameShort: "%fr3d_ldap.driver.accountDomainNameShort%" - user: -# enabled: "%fr3d_ldap.user.enabled%" - baseDn: "%fr3d_ldap.user.baseDn%" - filter: "%fr3d_ldap.user.filter%" - attributes: - - { ldap_attr: %fr3d_ldap.user.attribute.username%, user_method: setUsername } - - { ldap_attr: %fr3d_ldap.user.attribute.email%, user_method: setEmail } diff --git a/app/config/config_setup_test.yml b/app/config/config_setup_test.yml index 07b3b23d2..994a650da 100644 --- a/app/config/config_setup_test.yml +++ b/app/config/config_setup_test.yml @@ -7,7 +7,6 @@ imports: - { resource: config_doctrine.yml } - { resource: config_fos_user.yml } - { resource: config_dunglas.yml } - - { resource: config_ldap.yml } - { resource: config_partkeepr.yml } - { resource: config_filesystem.yml } From 90465d7a9437b207edaa44b607f4e2ef65281b7c Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 13:35:11 +0200 Subject: [PATCH 112/140] force Ocramius/ProxyManager 2.6.1 which uses laminas/laminas-code to remove zendframework/zend-code - PHP 7.4 required now --- composer.json | 2 +- composer.lock | 534 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 362 insertions(+), 174 deletions(-) diff --git a/composer.json b/composer.json index 4398f4dab..3bcc0c5c8 100755 --- a/composer.json +++ b/composer.json @@ -115,7 +115,7 @@ }, "config": { "platform": { - "php": "7.3.28" + "php": "7.4.18" } }, "extra": { diff --git a/composer.lock b/composer.lock index fe356f1cf..e16452b03 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4685ff0a844854ec60be33c942ae464e", + "content-hash": "9928ef023af4d766a74933110e35d549", "packages": [ { "name": "api-platform/core", @@ -2425,6 +2425,182 @@ ], "time": "2016-11-11T18:43:20+00:00" }, + { + "name": "laminas/laminas-code", + "version": "3.4.1", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-code.git", + "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766", + "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766", + "shasum": "" + }, + "require": { + "laminas/laminas-eventmanager": "^2.6 || ^3.0", + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^7.1" + }, + "conflict": { + "phpspec/prophecy": "<1.9.0" + }, + "replace": { + "zendframework/zend-code": "self.version" + }, + "require-dev": { + "doctrine/annotations": "^1.7", + "ext-phar": "*", + "laminas/laminas-coding-standard": "^1.0", + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "phpunit/phpunit": "^7.5.16 || ^8.4" + }, + "suggest": { + "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", + "laminas/laminas-stdlib": "Laminas\\Stdlib component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4.x-dev", + "dev-develop": "3.5.x-dev", + "dev-dev-4.0": "4.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laminas\\Code\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Extensions to the PHP Reflection API, static code scanning, and code generation", + "homepage": "https://laminas.dev", + "keywords": [ + "code", + "laminas" + ], + "time": "2019-12-31T16:28:24+00:00" + }, + { + "name": "laminas/laminas-eventmanager", + "version": "3.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-eventmanager.git", + "reference": "3da9d1c5334501c68cc68cd72cf5c4498dd7a14b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/3da9d1c5334501c68cc68cd72cf5c4498dd7a14b", + "reference": "3da9d1c5334501c68cc68cd72cf5c4498dd7a14b", + "shasum": "" + }, + "require": { + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^7.3 || ^8.0" + }, + "replace": { + "zendframework/zend-eventmanager": "^3.2.1" + }, + "require-dev": { + "container-interop/container-interop": "^1.1", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-stdlib": "^2.7.3 || ^3.0", + "phpbench/phpbench": "^0.17.1", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.4.1" + }, + "suggest": { + "container-interop/container-interop": "^1.1, to use the lazy listeners feature", + "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" + }, + "type": "library", + "autoload": { + "psr-4": { + "Laminas\\EventManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Trigger and listen to events within a PHP application", + "homepage": "https://laminas.dev", + "keywords": [ + "event", + "eventmanager", + "events", + "laminas" + ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-03-08T15:26:33+00:00" + }, + { + "name": "laminas/laminas-zendframework-bridge", + "version": "1.3.x-dev", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-zendframework-bridge.git", + "reference": "ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819", + "reference": "ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", + "psalm/plugin-phpunit": "^0.15.1", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.6" + }, + "type": "library", + "extra": { + "laminas": { + "module": "Laminas\\ZendFrameworkBridge" + } + }, + "autoload": { + "files": [ + "src/autoload.php" + ], + "psr-4": { + "Laminas\\ZendFrameworkBridge\\": "src//" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Alias legacy ZF class names to Laminas Project equivalents.", + "keywords": [ + "ZendFramework", + "autoloading", + "laminas", + "zf" + ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-02-25T21:55:08+00:00" + }, { "name": "michelf/php-markdown", "version": "1.7.0", @@ -2687,6 +2863,134 @@ }, "time": "2016-08-01T15:59:08+00:00" }, + { + "name": "ocramius/package-versions", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/PackageVersions.git", + "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/1d32342b8c1eb27353c8887c366147b4c2da673c", + "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0.0", + "php": "^7.3.0" + }, + "require-dev": { + "composer/composer": "^1.8.6", + "doctrine/coding-standard": "^6.0.0", + "ext-zip": "*", + "infection/infection": "^0.13.4", + "phpunit/phpunit": "^8.2.5", + "vimeo/psalm": "^3.4.9" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "time": "2019-07-17T15:49:50+00:00" + }, + { + "name": "ocramius/proxy-manager", + "version": "2.6.1", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/ProxyManager.git", + "reference": "dec37bfb3c3594440ee4fa263494189344787d22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/dec37bfb3c3594440ee4fa263494189344787d22", + "reference": "dec37bfb3c3594440ee4fa263494189344787d22", + "shasum": "" + }, + "require": { + "laminas/laminas-code": "^3.4.1", + "ocramius/package-versions": "^1.5.1", + "php": "7.4.*", + "webimpress/safe-writer": "^2.0" + }, + "conflict": { + "doctrine/annotations": "<1.6.1", + "laminas/laminas-stdlib": "<3.2.1", + "zendframework/zend-stdlib": "<3.2.1" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0.0", + "ext-phar": "*", + "infection/infection": "^0.15.0", + "mikey179/vfsstream": "^1.6.8", + "nikic/php-parser": "^4.3.0", + "phpbench/phpbench": "^0.16.10", + "phpunit/phpunit": "^8.5.1", + "slevomat/coding-standard": "^5.0.4", + "squizlabs/php_codesniffer": "^3.5.3", + "symfony/console": "^4.4.2", + "vimeo/psalm": "3.7.0" + }, + "suggest": { + "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)", + "laminas/laminas-soap": "To have the Soap adapter (Remote Object feature)", + "laminas/laminas-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)", + "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "ProxyManager\\": "src/ProxyManager" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.io/" + } + ], + "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", + "homepage": "https://github.com/Ocramius/ProxyManager", + "keywords": [ + "aop", + "lazy loading", + "proxy", + "proxy pattern", + "service proxies" + ], + "time": "2020-01-27T09:25:51+00:00" + }, { "name": "paragonie/random_compat", "version": "v2.0.19", @@ -5766,6 +6070,61 @@ ], "time": "2019-06-18T15:35:16+00:00" }, + { + "name": "webimpress/safe-writer", + "version": "dev-develop", + "source": { + "type": "git", + "url": "https://github.com/webimpress/safe-writer.git", + "reference": "f06fc5fb526980819d01549a86b5288d0c94aa50" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/f06fc5fb526980819d01549a86b5288d0c94aa50", + "reference": "f06fc5fb526980819d01549a86b5288d0c94aa50", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5.4", + "vimeo/psalm": "^4.7", + "webimpress/coding-standard": "^1.2.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev", + "dev-develop": "2.3.x-dev", + "dev-release-1.0": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Webimpress\\SafeWriter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "Tool to write files safely, to avoid race conditions", + "keywords": [ + "concurrent write", + "file writer", + "race condition", + "safe writer", + "webimpress" + ], + "funding": [ + { + "url": "https://github.com/michalbundyra", + "type": "github" + } + ], + "time": "2021-04-20T07:05:28+00:00" + }, { "name": "willdurand/jsonp-callback-validator", "version": "v1.1.0", @@ -6163,69 +6522,6 @@ ], "time": "2013-08-25T17:11:40+00:00" }, - { - "name": "ocramius/proxy-manager", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/57e9272ec0e8deccf09421596e0e2252df440e11", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "zendframework/zend-code": ">2.2.5,<3.0" - }, - "require-dev": { - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "1.5.*" - }, - "suggest": { - "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", - "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", - "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", - "zendframework/zend-stdlib": "To use the hydrator proxy", - "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "ProxyManager\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", - "homepage": "https://github.com/Ocramius/ProxyManager", - "keywords": [ - "aop", - "lazy loading", - "proxy", - "proxy pattern", - "service proxies" - ], - "time": "2015-08-09T04:28:19+00:00" - }, { "name": "phing/phing", "version": "2.16.3", @@ -7605,114 +7901,6 @@ } ], "time": "2020-11-13T16:28:59+00:00" - }, - { - "name": "zendframework/zend-code", - "version": "2.6.3", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-code.git", - "reference": "95033f061b083e16cdee60530ec260d7d628b887" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", - "reference": "95033f061b083e16cdee60530ec260d7d628b887", - "shasum": "" - }, - "require": { - "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", - "zendframework/zend-eventmanager": "^2.6 || ^3.0" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.8.21", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "zendframework/zend-stdlib": "Zend\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides facilities to generate arbitrary code using an object oriented interface", - "homepage": "https://github.com/zendframework/zend-code", - "keywords": [ - "code", - "zf2" - ], - "abandoned": "laminas/laminas-code", - "time": "2016-04-20T17:26:42+00:00" - }, - { - "name": "zendframework/zend-eventmanager", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "a5e2583a211f73604691586b8406ff7296a946dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd", - "reference": "a5e2583a211f73604691586b8406ff7296a946dd", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "^0.1", - "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0" - }, - "suggest": { - "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", - "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://github.com/zendframework/zend-eventmanager", - "keywords": [ - "event", - "eventmanager", - "events", - "zf2" - ], - "abandoned": "laminas/laminas-eventmanager", - "time": "2018-04-25T15:33:34+00:00" } ], "aliases": [], @@ -7730,7 +7918,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3.28" + "php": "7.4.18" }, "plugin-api-version": "1.1.0" } From 9f23b7053c881ebda4fbaf2b68c75641fb891ab4 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 13:44:53 +0200 Subject: [PATCH 113/140] doctrine/orm to v2.6.6 and composer install runs with NO errors again!!! --- app/check.php | 145 ------ app/config/config_framework.yml | 11 +- composer.json | 2 +- composer.lock | 859 ++++++++++++++++---------------- 4 files changed, 440 insertions(+), 577 deletions(-) delete mode 100755 app/check.php diff --git a/app/check.php b/app/check.php deleted file mode 100755 index 2cf2dcec2..000000000 --- a/app/check.php +++ /dev/null @@ -1,145 +0,0 @@ -getPhpIniConfigPath(); - -echo_title('Symfony Requirements Checker'); - -echo '> PHP is using the following php.ini file:'.PHP_EOL; -if ($iniPath) { - echo_style('green', ' '.$iniPath); -} else { - echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!'); -} - -echo PHP_EOL.PHP_EOL; - -echo '> Checking Symfony requirements:'.PHP_EOL.' '; - -$messages = array(); -foreach ($symfonyRequirements->getRequirements() as $req) { - if ($helpText = get_error_message($req, $lineSize)) { - echo_style('red', 'E'); - $messages['error'][] = $helpText; - } else { - echo_style('green', '.'); - } -} - -$checkPassed = empty($messages['error']); - -foreach ($symfonyRequirements->getRecommendations() as $req) { - if ($helpText = get_error_message($req, $lineSize)) { - echo_style('yellow', 'W'); - $messages['warning'][] = $helpText; - } else { - echo_style('green', '.'); - } -} - -if ($checkPassed) { - echo_block('success', 'OK', 'Your system is ready to run Symfony projects'); -} else { - echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects'); - - echo_title('Fix the following mandatory requirements', 'red'); - - foreach ($messages['error'] as $helpText) { - echo ' * '.$helpText.PHP_EOL; - } -} - -if (!empty($messages['warning'])) { - echo_title('Optional recommendations to improve your setup', 'yellow'); - - foreach ($messages['warning'] as $helpText) { - echo ' * '.$helpText.PHP_EOL; - } -} - -echo PHP_EOL; -echo_style('title', 'Note'); -echo ' The command console could use a different php.ini file'.PHP_EOL; -echo_style('title', '~~~~'); -echo ' than the one used with your web server. To be on the'.PHP_EOL; -echo ' safe side, please check the requirements from your web'.PHP_EOL; -echo ' server using the '; -echo_style('yellow', 'web/config.php'); -echo ' script.'.PHP_EOL; -echo PHP_EOL; - -exit($checkPassed ? 0 : 1); - -function get_error_message(Requirement $requirement, $lineSize) -{ - if ($requirement->isFulfilled()) { - return; - } - - $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; - $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; - - return $errorMessage; -} - -function echo_title($title, $style = null) -{ - $style = $style ?: 'title'; - - echo PHP_EOL; - echo_style($style, $title.PHP_EOL); - echo_style($style, str_repeat('~', strlen($title)).PHP_EOL); - echo PHP_EOL; -} - -function echo_style($style, $message) -{ - // ANSI color codes - $styles = array( - 'reset' => "\033[0m", - 'red' => "\033[31m", - 'green' => "\033[32m", - 'yellow' => "\033[33m", - 'error' => "\033[37;41m", - 'success' => "\033[37;42m", - 'title' => "\033[34m", - ); - $supports = has_color_support(); - - echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : ''); -} - -function echo_block($style, $title, $message) -{ - $message = ' '.trim($message).' '; - $width = strlen($message); - - echo PHP_EOL.PHP_EOL; - - echo_style($style, str_repeat(' ', $width)); - echo PHP_EOL; - echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT)); - echo PHP_EOL; - echo_style($style, $message); - echo PHP_EOL; - echo_style($style, str_repeat(' ', $width)); - echo PHP_EOL; -} - -function has_color_support() -{ - static $support; - - if (null === $support) { - if (DIRECTORY_SEPARATOR == '\\') { - $support = false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI'); - } else { - $support = function_exists('posix_isatty') && @posix_isatty(STDOUT); - } - } - - return $support; -} diff --git a/app/config/config_framework.yml b/app/config/config_framework.yml index 3617e781c..bfe860695 100644 --- a/app/config/config_framework.yml +++ b/app/config/config_framework.yml @@ -9,7 +9,7 @@ framework: form: ~ csrf_protection: ~ # validation: { enabled: true, api: auto, enable_annotations: true, strict_email: true } - validation: { enabled: true, enable_annotations: true, strict_email: true } + validation: { enabled: true, enable_annotations: true, strict_email: true, cache: validator.mapping.cache.doctrine.apc } templating: engines: ['twig'] #assets_version: SomeVersionScheme @@ -22,10 +22,13 @@ framework: fragments: ~ http_method_override: true cache: +# directory: '%kernel.cache_dir%/pools' # Only used with cache.adapter.filesystem + directory: '/var/www/partkeepr/app/cache' + app: cache.adapter.apcu + system: cache.adapter.apcu # app: cache.adapter.apcu - app: cache.adapter.filesystem - system: cache.adapter.system - directory: /var/www/partkeepr/app/cache +# app: cache.adapter.filesystem +# system: cache.adapter.system # pools: # app.cache.api: # adapter : [cache.app] diff --git a/composer.json b/composer.json index 3bcc0c5c8..6d6112aa9 100755 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "doctrine/doctrine-fixtures-bundle": "v2.4.1", "doctrine/doctrine-migrations-bundle": "v1.3.2", "doctrine/migrations": "v1.2.2", - "doctrine/orm": "v2.5.14", + "doctrine/orm": "v2.6.6", "fortawesome/font-awesome": "5.15.1", "friendsofsymfony/rest-bundle": "2.0.1", "friendsofsymfony/user-bundle": "v2.1.2", diff --git a/composer.lock b/composer.lock index e16452b03..c3b142a60 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9928ef023af4d766a74933110e35d549", + "content-hash": "9f1974d0fba17afcca01a8f37c9a3c08", "packages": [ { "name": "api-platform/core", @@ -1371,38 +1371,39 @@ }, { "name": "doctrine/orm", - "version": "v2.5.14", + "version": "v2.6.6", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754" + "reference": "2d9b9351831d1230881c52f006011cbf72fe944e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/810a7baf81462a5ddf10e8baa8cb94b6eec02754", - "reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754", + "url": "https://api.github.com/repos/doctrine/orm/zipball/2d9b9351831d1230881c52f006011cbf72fe944e", + "reference": "2d9b9351831d1230881c52f006011cbf72fe944e", "shasum": "" }, "require": { - "doctrine/cache": "~1.4", - "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.9-dev", - "doctrine/dbal": ">=2.5-dev,<2.7-dev", - "doctrine/instantiator": "^1.0.1", + "doctrine/annotations": "~1.5", + "doctrine/cache": "~1.6", + "doctrine/collections": "^1.4", + "doctrine/common": "^2.7.1", + "doctrine/dbal": "^2.6", + "doctrine/instantiator": "~1.1", "ext-pdo": "*", - "php": ">=5.4", - "symfony/console": "~2.5|~3.0|~4.0" + "php": "^7.1", + "symfony/console": "~3.0|~4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "symfony/yaml": "~2.3|~3.0|~4.0" + "doctrine/coding-standard": "^5.0", + "phpunit/phpunit": "^7.5", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "bin": [ - "bin/doctrine", - "bin/doctrine.php" + "bin/doctrine" ], "type": "library", "extra": { @@ -1411,8 +1412,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\ORM\\": "lib/" + "psr-4": { + "Doctrine\\ORM\\": "lib/Doctrine/ORM" } }, "notification-url": "https://packagist.org/downloads/", @@ -1420,6 +1421,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -1428,13 +1433,13 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], "description": "Object-Relational-Mapper for PHP", @@ -1443,7 +1448,7 @@ "database", "orm" ], - "time": "2017-12-17T02:57:51+00:00" + "time": "2019-11-18T22:01:21+00:00" }, { "name": "egulias/email-validator", @@ -2425,182 +2430,6 @@ ], "time": "2016-11-11T18:43:20+00:00" }, - { - "name": "laminas/laminas-code", - "version": "3.4.1", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-code.git", - "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766", - "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766", - "shasum": "" - }, - "require": { - "laminas/laminas-eventmanager": "^2.6 || ^3.0", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.1" - }, - "conflict": { - "phpspec/prophecy": "<1.9.0" - }, - "replace": { - "zendframework/zend-code": "self.version" - }, - "require-dev": { - "doctrine/annotations": "^1.7", - "ext-phar": "*", - "laminas/laminas-coding-standard": "^1.0", - "laminas/laminas-stdlib": "^2.7 || ^3.0", - "phpunit/phpunit": "^7.5.16 || ^8.4" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "laminas/laminas-stdlib": "Laminas\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4.x-dev", - "dev-develop": "3.5.x-dev", - "dev-dev-4.0": "4.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Laminas\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Extensions to the PHP Reflection API, static code scanning, and code generation", - "homepage": "https://laminas.dev", - "keywords": [ - "code", - "laminas" - ], - "time": "2019-12-31T16:28:24+00:00" - }, - { - "name": "laminas/laminas-eventmanager", - "version": "3.4.x-dev", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "3da9d1c5334501c68cc68cd72cf5c4498dd7a14b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/3da9d1c5334501c68cc68cd72cf5c4498dd7a14b", - "reference": "3da9d1c5334501c68cc68cd72cf5c4498dd7a14b", - "shasum": "" - }, - "require": { - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ^8.0" - }, - "replace": { - "zendframework/zend-eventmanager": "^3.2.1" - }, - "require-dev": { - "container-interop/container-interop": "^1.1", - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-stdlib": "^2.7.3 || ^3.0", - "phpbench/phpbench": "^0.17.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.4.1" - }, - "suggest": { - "container-interop/container-interop": "^1.1, to use the lazy listeners feature", - "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://laminas.dev", - "keywords": [ - "event", - "eventmanager", - "events", - "laminas" - ], - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2021-03-08T15:26:33+00:00" - }, - { - "name": "laminas/laminas-zendframework-bridge", - "version": "1.3.x-dev", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819", - "reference": "ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819", - "shasum": "" - }, - "require": { - "php": "^7.3 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", - "psalm/plugin-phpunit": "^0.15.1", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.6" - }, - "type": "library", - "extra": { - "laminas": { - "module": "Laminas\\ZendFrameworkBridge" - } - }, - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Laminas\\ZendFrameworkBridge\\": "src//" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Alias legacy ZF class names to Laminas Project equivalents.", - "keywords": [ - "ZendFramework", - "autoloading", - "laminas", - "zf" - ], - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2021-02-25T21:55:08+00:00" - }, { "name": "michelf/php-markdown", "version": "1.7.0", @@ -2840,156 +2669,28 @@ }, "type": "library", "autoload": { - "psr-0": { - "SpriteGenerator": "src/" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kazimieras Butkus", - "email": "kazimieras@nfq.lt", - "role": "Developer" - } - ], - "description": "Generate sprites with PHP and twig templates", - "keywords": [ - "sprite" - ], - "support": { - "source": "https://github.com/partkeepr/sprite-generator/tree/min-image-fix" - }, - "time": "2016-08-01T15:59:08+00:00" - }, - { - "name": "ocramius/package-versions", - "version": "1.5.1", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/1d32342b8c1eb27353c8887c366147b4c2da673c", - "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0.0", - "php": "^7.3.0" - }, - "require-dev": { - "composer/composer": "^1.8.6", - "doctrine/coding-standard": "^6.0.0", - "ext-zip": "*", - "infection/infection": "^0.13.4", - "phpunit/phpunit": "^8.2.5", - "vimeo/psalm": "^3.4.9" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2019-07-17T15:49:50+00:00" - }, - { - "name": "ocramius/proxy-manager", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "dec37bfb3c3594440ee4fa263494189344787d22" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/dec37bfb3c3594440ee4fa263494189344787d22", - "reference": "dec37bfb3c3594440ee4fa263494189344787d22", - "shasum": "" - }, - "require": { - "laminas/laminas-code": "^3.4.1", - "ocramius/package-versions": "^1.5.1", - "php": "7.4.*", - "webimpress/safe-writer": "^2.0" - }, - "conflict": { - "doctrine/annotations": "<1.6.1", - "laminas/laminas-stdlib": "<3.2.1", - "zendframework/zend-stdlib": "<3.2.1" - }, - "require-dev": { - "doctrine/coding-standard": "^6.0.0", - "ext-phar": "*", - "infection/infection": "^0.15.0", - "mikey179/vfsstream": "^1.6.8", - "nikic/php-parser": "^4.3.0", - "phpbench/phpbench": "^0.16.10", - "phpunit/phpunit": "^8.5.1", - "slevomat/coding-standard": "^5.0.4", - "squizlabs/php_codesniffer": "^3.5.3", - "symfony/console": "^4.4.2", - "vimeo/psalm": "3.7.0" - }, - "suggest": { - "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)", - "laminas/laminas-soap": "To have the Soap adapter (Remote Object feature)", - "laminas/laminas-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)", - "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "ProxyManager\\": "src/ProxyManager" + "psr-0": { + "SpriteGenerator": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.io/" + "name": "Kazimieras Butkus", + "email": "kazimieras@nfq.lt", + "role": "Developer" } ], - "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", - "homepage": "https://github.com/Ocramius/ProxyManager", + "description": "Generate sprites with PHP and twig templates", "keywords": [ - "aop", - "lazy loading", - "proxy", - "proxy pattern", - "service proxies" + "sprite" ], - "time": "2020-01-27T09:25:51+00:00" + "support": { + "source": "https://github.com/partkeepr/sprite-generator/tree/min-image-fix" + }, + "time": "2016-08-01T15:59:08+00:00" }, { "name": "paragonie/random_compat", @@ -6070,61 +5771,6 @@ ], "time": "2019-06-18T15:35:16+00:00" }, - { - "name": "webimpress/safe-writer", - "version": "dev-develop", - "source": { - "type": "git", - "url": "https://github.com/webimpress/safe-writer.git", - "reference": "f06fc5fb526980819d01549a86b5288d0c94aa50" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/f06fc5fb526980819d01549a86b5288d0c94aa50", - "reference": "f06fc5fb526980819d01549a86b5288d0c94aa50", - "shasum": "" - }, - "require": { - "php": "^7.3 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.5.4", - "vimeo/psalm": "^4.7", - "webimpress/coding-standard": "^1.2.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2.x-dev", - "dev-develop": "2.3.x-dev", - "dev-release-1.0": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Webimpress\\SafeWriter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "Tool to write files safely, to avoid race conditions", - "keywords": [ - "concurrent write", - "file writer", - "race condition", - "safe writer", - "webimpress" - ], - "funding": [ - { - "url": "https://github.com/michalbundyra", - "type": "github" - } - ], - "time": "2021-04-20T07:05:28+00:00" - }, { "name": "willdurand/jsonp-callback-validator", "version": "v1.1.0", @@ -6286,63 +5932,239 @@ "export", "import" ], - "time": "2015-04-21T14:06:20+00:00" + "time": "2015-04-21T14:06:20+00:00" + }, + { + "name": "dunglas/php-property-info", + "version": "v0.2.3", + "source": { + "type": "git", + "url": "https://github.com/dunglas/php-property-info.git", + "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dunglas/php-property-info/zipball/698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", + "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "doctrine/orm": "~2.3", + "phpdocumentor/reflection": "~1.0", + "phpspec/phpspec": "~2.1" + }, + "suggest": { + "doctrine/orm": "To use Doctrine metadata", + "phpdocumentor/reflection": "To use the PHPDoc", + "symfony/validator": "To use Symfony validator metadata" + }, + "type": "library", + "autoload": { + "psr-0": { + "PropertyInfo\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com" + } + ], + "description": "Retrieve type and description of PHP properties using various sources ", + "homepage": "http://dunglas.fr", + "keywords": [ + "doctrine", + "phpdoc", + "property", + "symfony", + "type", + "validator" + ], + "abandoned": "symfony/property-info", + "time": "2015-12-29T08:21:00+00:00" + }, + { + "name": "laminas/laminas-code", + "version": "3.4.1", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-code.git", + "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766", + "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766", + "shasum": "" + }, + "require": { + "laminas/laminas-eventmanager": "^2.6 || ^3.0", + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^7.1" + }, + "conflict": { + "phpspec/prophecy": "<1.9.0" + }, + "replace": { + "zendframework/zend-code": "self.version" + }, + "require-dev": { + "doctrine/annotations": "^1.7", + "ext-phar": "*", + "laminas/laminas-coding-standard": "^1.0", + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "phpunit/phpunit": "^7.5.16 || ^8.4" + }, + "suggest": { + "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", + "laminas/laminas-stdlib": "Laminas\\Stdlib component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4.x-dev", + "dev-develop": "3.5.x-dev", + "dev-dev-4.0": "4.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laminas\\Code\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Extensions to the PHP Reflection API, static code scanning, and code generation", + "homepage": "https://laminas.dev", + "keywords": [ + "code", + "laminas" + ], + "time": "2019-12-31T16:28:24+00:00" + }, + { + "name": "laminas/laminas-eventmanager", + "version": "3.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-eventmanager.git", + "reference": "3da9d1c5334501c68cc68cd72cf5c4498dd7a14b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/3da9d1c5334501c68cc68cd72cf5c4498dd7a14b", + "reference": "3da9d1c5334501c68cc68cd72cf5c4498dd7a14b", + "shasum": "" + }, + "require": { + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^7.3 || ^8.0" + }, + "replace": { + "zendframework/zend-eventmanager": "^3.2.1" + }, + "require-dev": { + "container-interop/container-interop": "^1.1", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-stdlib": "^2.7.3 || ^3.0", + "phpbench/phpbench": "^0.17.1", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.4.1" + }, + "suggest": { + "container-interop/container-interop": "^1.1, to use the lazy listeners feature", + "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" + }, + "type": "library", + "autoload": { + "psr-4": { + "Laminas\\EventManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Trigger and listen to events within a PHP application", + "homepage": "https://laminas.dev", + "keywords": [ + "event", + "eventmanager", + "events", + "laminas" + ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-03-08T15:26:33+00:00" }, { - "name": "dunglas/php-property-info", - "version": "v0.2.3", + "name": "laminas/laminas-zendframework-bridge", + "version": "1.3.x-dev", "source": { "type": "git", - "url": "https://github.com/dunglas/php-property-info.git", - "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a" + "url": "https://github.com/laminas/laminas-zendframework-bridge.git", + "reference": "ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dunglas/php-property-info/zipball/698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", - "reference": "698a5fa4f3901dba31e9163599aa9d4fdbf88f1a", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819", + "reference": "ff8e9a7832de38fc329eb7cc0bc2b9bdaeddb819", "shasum": "" }, "require": { - "php": ">=5.4" + "php": "^7.3 || ^8.0" }, "require-dev": { - "doctrine/orm": "~2.3", - "phpdocumentor/reflection": "~1.0", - "phpspec/phpspec": "~2.1" - }, - "suggest": { - "doctrine/orm": "To use Doctrine metadata", - "phpdocumentor/reflection": "To use the PHPDoc", - "symfony/validator": "To use Symfony validator metadata" + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", + "psalm/plugin-phpunit": "^0.15.1", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.6" }, "type": "library", + "extra": { + "laminas": { + "module": "Laminas\\ZendFrameworkBridge" + } + }, "autoload": { - "psr-0": { - "PropertyInfo\\": "src/" + "files": [ + "src/autoload.php" + ], + "psr-4": { + "Laminas\\ZendFrameworkBridge\\": "src//" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], - "authors": [ + "description": "Alias legacy ZF class names to Laminas Project equivalents.", + "keywords": [ + "ZendFramework", + "autoloading", + "laminas", + "zf" + ], + "funding": [ { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com" + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" } ], - "description": "Retrieve type and description of PHP properties using various sources ", - "homepage": "http://dunglas.fr", - "keywords": [ - "doctrine", - "phpdoc", - "property", - "symfony", - "type", - "validator" - ], - "abandoned": "symfony/property-info", - "time": "2015-12-29T08:21:00+00:00" + "time": "2021-02-25T21:55:08+00:00" }, { "name": "liip/functional-test-bundle", @@ -6522,6 +6344,134 @@ ], "time": "2013-08-25T17:11:40+00:00" }, + { + "name": "ocramius/package-versions", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/PackageVersions.git", + "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/1d32342b8c1eb27353c8887c366147b4c2da673c", + "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0.0", + "php": "^7.3.0" + }, + "require-dev": { + "composer/composer": "^1.8.6", + "doctrine/coding-standard": "^6.0.0", + "ext-zip": "*", + "infection/infection": "^0.13.4", + "phpunit/phpunit": "^8.2.5", + "vimeo/psalm": "^3.4.9" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "time": "2019-07-17T15:49:50+00:00" + }, + { + "name": "ocramius/proxy-manager", + "version": "2.6.1", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/ProxyManager.git", + "reference": "dec37bfb3c3594440ee4fa263494189344787d22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/dec37bfb3c3594440ee4fa263494189344787d22", + "reference": "dec37bfb3c3594440ee4fa263494189344787d22", + "shasum": "" + }, + "require": { + "laminas/laminas-code": "^3.4.1", + "ocramius/package-versions": "^1.5.1", + "php": "7.4.*", + "webimpress/safe-writer": "^2.0" + }, + "conflict": { + "doctrine/annotations": "<1.6.1", + "laminas/laminas-stdlib": "<3.2.1", + "zendframework/zend-stdlib": "<3.2.1" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0.0", + "ext-phar": "*", + "infection/infection": "^0.15.0", + "mikey179/vfsstream": "^1.6.8", + "nikic/php-parser": "^4.3.0", + "phpbench/phpbench": "^0.16.10", + "phpunit/phpunit": "^8.5.1", + "slevomat/coding-standard": "^5.0.4", + "squizlabs/php_codesniffer": "^3.5.3", + "symfony/console": "^4.4.2", + "vimeo/psalm": "3.7.0" + }, + "suggest": { + "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)", + "laminas/laminas-soap": "To have the Soap adapter (Remote Object feature)", + "laminas/laminas-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)", + "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "ProxyManager\\": "src/ProxyManager" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.io/" + } + ], + "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", + "homepage": "https://github.com/Ocramius/ProxyManager", + "keywords": [ + "aop", + "lazy loading", + "proxy", + "proxy pattern", + "service proxies" + ], + "time": "2020-01-27T09:25:51+00:00" + }, { "name": "phing/phing", "version": "2.16.3", @@ -7901,6 +7851,61 @@ } ], "time": "2020-11-13T16:28:59+00:00" + }, + { + "name": "webimpress/safe-writer", + "version": "dev-develop", + "source": { + "type": "git", + "url": "https://github.com/webimpress/safe-writer.git", + "reference": "f06fc5fb526980819d01549a86b5288d0c94aa50" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/f06fc5fb526980819d01549a86b5288d0c94aa50", + "reference": "f06fc5fb526980819d01549a86b5288d0c94aa50", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5.4", + "vimeo/psalm": "^4.7", + "webimpress/coding-standard": "^1.2.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev", + "dev-develop": "2.3.x-dev", + "dev-release-1.0": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Webimpress\\SafeWriter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "Tool to write files safely, to avoid race conditions", + "keywords": [ + "concurrent write", + "file writer", + "race condition", + "safe writer", + "webimpress" + ], + "funding": [ + { + "url": "https://github.com/michalbundyra", + "type": "github" + } + ], + "time": "2021-04-20T07:05:28+00:00" } ], "aliases": [], From 3db087d1d3c9943bf7e7f5450d9342568bc92c7d Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 13:48:11 +0200 Subject: [PATCH 114/140] restore Sensio GeneratorBundle in AppKernel --- app/AppKernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index e1c568e0b..3740503fa 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -38,7 +38,7 @@ public function registerBundles() $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); -// $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); + $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); $bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(); } From b4e08564a83e7096263af456600d2f1edfe7f823 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 13:59:39 +0200 Subject: [PATCH 115/140] remove duplicate use Assert --- src/PartKeepr/AuthBundle/Entity/User.php | 1 - src/PartKeepr/PartBundle/Entity/Part.php | 1 - src/PartKeepr/PartBundle/Entity/PartDistributor.php | 1 - src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php | 1 - src/PartKeepr/ProjectBundle/Entity/ProjectPart.php | 1 - src/PartKeepr/ProjectBundle/Entity/ReportProject.php | 1 - src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php | 1 - src/PartKeepr/UnitBundle/Entity/Unit.php | 1 - 8 files changed, 8 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Entity/User.php b/src/PartKeepr/AuthBundle/Entity/User.php index a8765397a..9d5ff1849 100644 --- a/src/PartKeepr/AuthBundle/Entity/User.php +++ b/src/PartKeepr/AuthBundle/Entity/User.php @@ -11,7 +11,6 @@ use Symfony\Component\Security\Core\User\EquatableInterface; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * @ApiResource( diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index 41332ca78..71a80ee1e 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -18,7 +18,6 @@ use PartKeepr\StorageLocationBundle\Entity\StorageLocation; use PartKeepr\UploadedFileBundle\Annotation\UploadedFileCollection; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * Represents a part in the database. The heart of our project. Handle with care! diff --git a/src/PartKeepr/PartBundle/Entity/PartDistributor.php b/src/PartKeepr/PartBundle/Entity/PartDistributor.php index d9f9a9ca3..b8ecfac85 100644 --- a/src/PartKeepr/PartBundle/Entity/PartDistributor.php +++ b/src/PartKeepr/PartBundle/Entity/PartDistributor.php @@ -9,7 +9,6 @@ use PartKeepr\DistributorBundle\Entity\Distributor; use PartKeepr\PartBundle\Exceptions\PackagingUnitOutOfRangeException; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * This class represents the link between a part and a distributor. diff --git a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php index 842a70f5a..9627b3662 100644 --- a/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php +++ b/src/PartKeepr/PartBundle/Entity/PartMeasurementUnit.php @@ -9,7 +9,6 @@ use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * This entity represents a part measurement unit. Typical measurement units are pieces, centimeters etc. diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php b/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php index ed94551f9..b72435498 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php +++ b/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php @@ -10,7 +10,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\PartBundle\Entity\Part; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * Represents a project part. diff --git a/src/PartKeepr/ProjectBundle/Entity/ReportProject.php b/src/PartKeepr/ProjectBundle/Entity/ReportProject.php index b208766ce..5cc19dbd2 100644 --- a/src/PartKeepr/ProjectBundle/Entity/ReportProject.php +++ b/src/PartKeepr/ProjectBundle/Entity/ReportProject.php @@ -8,7 +8,6 @@ use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * Represents one project and the quantity. diff --git a/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php b/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php index 2f7750de5..4ea07f355 100644 --- a/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php +++ b/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php @@ -8,7 +8,6 @@ use PartKeepr\CoreBundle\Entity\BaseEntity; use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * Represents an SI Prefix. diff --git a/src/PartKeepr/UnitBundle/Entity/Unit.php b/src/PartKeepr/UnitBundle/Entity/Unit.php index 82d606f67..7bb10d242 100644 --- a/src/PartKeepr/UnitBundle/Entity/Unit.php +++ b/src/PartKeepr/UnitBundle/Entity/Unit.php @@ -10,7 +10,6 @@ use PartKeepr\DoctrineReflectionBundle\Annotation\TargetService; use PartKeepr\SiPrefixBundle\Entity\SiPrefix; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; /** * This object represents an unit. Units can be: Volt, Hertz etc. From 6cedf5c314b800800bff9b623b87a2b5d68604a2 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 14:09:49 +0200 Subject: [PATCH 116/140] fix extra } --- src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php index eee034f0b..4221c5866 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php +++ b/src/PartKeepr/TipOfTheDayBundle/Entity/TipOfTheDay.php @@ -33,7 +33,7 @@ * "swagger"= { * "method"="GET", * }, - * "get"={"method"="GET"}}, + * "get"={"method"="GET"}, * "mark_read"={"route_name"="TipMarkRead"} * } * ) From 05689f0f4fc7ca8e4a27b599b7eaab45395bf5bd Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 14:51:55 +0200 Subject: [PATCH 117/140] replacement of ActionUtilTrait by RequestAttributesExtractor::extractAttributes --- src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php | 5 +++-- .../AuthBundle/Action/DeletePreferenceAction.php | 5 +++-- src/PartKeepr/AuthBundle/Action/DeleteUserAction.php | 8 +++++--- src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php | 8 +++++--- src/PartKeepr/AuthBundle/Action/LoginAction.php | 5 +++-- src/PartKeepr/AuthBundle/Action/PostUserAction.php | 8 +++++--- src/PartKeepr/AuthBundle/Action/PutUserAction.php | 8 +++++--- src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php | 8 +++++--- .../BatchJobBundle/Action/ExecuteBatchJobAction.php | 9 ++++++--- .../CategoryBundle/Action/GetRootNodeAction.php | 8 +++++--- src/PartKeepr/CategoryBundle/Action/MoveAction.php | 8 +++++--- .../CoreBundle/Action/SystemNoticeAcknowledgeAction.php | 9 ++++++--- .../EventListener/RequestExceptionListener.php | 6 ++++-- .../FrontendBundle/Action/MarkAsDefaultAction.php | 8 +++++--- .../ImageBundle/Controller/TemporaryImageController.php | 8 +++++--- src/PartKeepr/PartBundle/Action/AddStockAction.php | 8 +++++--- src/PartKeepr/PartBundle/Action/GetPartsAction.php | 9 ++++++--- src/PartKeepr/PartBundle/Action/PartPostAction.php | 8 +++++--- src/PartKeepr/PartBundle/Action/PartPutAction.php | 8 +++++--- src/PartKeepr/PartBundle/Action/RemoveStockAction.php | 8 +++++--- src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php | 8 +++++--- src/PartKeepr/PartBundle/Action/SetStockAction.php | 8 +++++--- .../ProjectBundle/Controller/ProjectReportController.php | 8 +++++--- .../Action/DeletePreferenceAction.php | 5 +++-- .../Action/GetPreferencesAction.php | 8 +++++--- .../Action/SetPreferenceAction.php | 8 +++++--- .../Action/GetTipHistoryCollectionAction.php | 8 +++++--- .../TipOfTheDayBundle/Action/MarkTipReadAction.php | 9 ++++++--- .../TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php | 6 ++++-- .../Controller/TemporaryFileController.php | 8 +++++--- 30 files changed, 144 insertions(+), 84 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php b/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php index dd0e80e57..538a08bee 100644 --- a/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php +++ b/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php @@ -2,7 +2,8 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +// use ApiPlatform\Core\Action\ActionUtilTrait; + use FOS\UserBundle\Model\UserManagerInterface; use FOS\UserBundle\Util\UserManipulator; use PartKeepr\AuthBundle\Exceptions\OldPasswordWrongException; @@ -14,7 +15,7 @@ class ChangePasswordAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var UserService diff --git a/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php b/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php index c9d8301c7..c54b83ec2 100644 --- a/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php @@ -2,7 +2,8 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +// use ApiPlatform\Core\Action\ActionUtilTrait; + use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\AuthBundle\Services\UserPreferenceService; use PartKeepr\AuthBundle\Services\UserService; @@ -14,7 +15,7 @@ */ class DeletePreferenceAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var UserService diff --git a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php index 7bb4a841f..c8699e138 100644 --- a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\AuthBundle\Entity\User; @@ -17,7 +19,7 @@ */ class DeleteUserAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -68,7 +70,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /** * @var User diff --git a/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php b/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php index d97b6b65a..5e02f9024 100644 --- a/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php +++ b/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\AuthBundle\Services\UserPreferenceService; @@ -17,7 +19,7 @@ */ class GetPreferencesAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var UserService @@ -69,7 +71,7 @@ public function __invoke(Request $request) $preferences = $this->userPreferenceService->getPreferences($user); - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /* * @var ResourceInterface $resourceType diff --git a/src/PartKeepr/AuthBundle/Action/LoginAction.php b/src/PartKeepr/AuthBundle/Action/LoginAction.php index f7e82512f..63de2c2ff 100644 --- a/src/PartKeepr/AuthBundle/Action/LoginAction.php +++ b/src/PartKeepr/AuthBundle/Action/LoginAction.php @@ -2,7 +2,8 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +// use ApiPlatform\Core\Action\ActionUtilTrait; + use PartKeepr\AuthBundle\Services\UserPreferenceService; use PartKeepr\AuthBundle\Services\UserService; use Symfony\Component\HttpFoundation\Request; @@ -10,7 +11,7 @@ class LoginAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var UserService diff --git a/src/PartKeepr/AuthBundle/Action/PostUserAction.php b/src/PartKeepr/AuthBundle/Action/PostUserAction.php index e82ad652e..33408a339 100644 --- a/src/PartKeepr/AuthBundle/Action/PostUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PostUserAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; @@ -15,7 +17,7 @@ class PostUserAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -68,7 +70,7 @@ public function __invoke(Request $request) /** * @var ResourceInterface */ - list($resourceType, $format) = $this->extractAttributes($request); + list($resourceType, $format) = RequestAttributesExtractor::extractAttributes($request); if ($this->userService->checkUserLimit() === true) { throw new UserLimitReachedException(); diff --git a/src/PartKeepr/AuthBundle/Action/PutUserAction.php b/src/PartKeepr/AuthBundle/Action/PutUserAction.php index ec8b9390b..0d29f47b7 100644 --- a/src/PartKeepr/AuthBundle/Action/PutUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PutUserAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; @@ -16,7 +18,7 @@ class PutUserAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -71,7 +73,7 @@ public function __invoke(Request $request, $id) /** * @var ResourceInterface */ - list($resourceType, $format) = $this->extractAttributes($request); + list($resourceType, $format) = RequestAttributesExtractor::extractAttributes($request); /** * @var User diff --git a/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php b/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php index 233f5abd8..83d143700 100644 --- a/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php +++ b/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\AuthBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\AuthBundle\Services\UserPreferenceService; @@ -17,7 +19,7 @@ */ class SetPreferenceAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var UserService @@ -90,7 +92,7 @@ public function __invoke(Request $request) throw new \Exception('Invalid format'); } - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /* * @var ResourceInterface $resourceType diff --git a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php index 39869871e..30f904b84 100644 --- a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php +++ b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php @@ -4,7 +4,10 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; -use ApiPlatform\Core\Action\ActionUtilTrait; + +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\IriConverter; use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; @@ -17,7 +20,7 @@ class ExecuteBatchJobAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -80,7 +83,7 @@ public function __construct( */ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /** * @var BatchJob diff --git a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php index 518323d9f..9ec4493a0 100644 --- a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php +++ b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\CategoryBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use Gedmo\Tree\Entity\Repository\AbstractTreeRepository; @@ -15,7 +17,7 @@ */ class GetRootNodeAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var ManagerRegistry @@ -68,7 +70,7 @@ public function __construct(ManagerRegistry $manager) **/ public function __invoke(Request $request) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /* * @var ResourceInterface $resourceType diff --git a/src/PartKeepr/CategoryBundle/Action/MoveAction.php b/src/PartKeepr/CategoryBundle/Action/MoveAction.php index 36ff15e5b..65705b206 100644 --- a/src/PartKeepr/CategoryBundle/Action/MoveAction.php +++ b/src/PartKeepr/CategoryBundle/Action/MoveAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\CategoryBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\IriConverter; use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; @@ -18,7 +20,7 @@ */ class MoveAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -86,7 +88,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $entity = $this->getItem($this->dataProvider, $resourceType, $id); diff --git a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php index c9b34296a..c642c1ffa 100644 --- a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php +++ b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php @@ -3,7 +3,10 @@ namespace PartKeepr\CoreBundle\Action; use Doctrine\ORM\EntityManager; -use ApiPlatform\Core\Action\ActionUtilTrait; + +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\CoreBundle\Entity\SystemNotice; @@ -11,7 +14,7 @@ class SystemNoticeAcknowledgeAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -54,7 +57,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $systemNotice = $this->getItem($this->dataProvider, $resourceType, $id); diff --git a/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php b/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php index 427369848..27808233e 100644 --- a/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php +++ b/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php @@ -9,7 +9,9 @@ namespace PartKeepr\CoreBundle\EventListener; use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException; -use ApiPlatform\Core\Action\ActionUtilTrait; + +// use ApiPlatform\Core\Action\ActionUtilTrait; + use ApiPlatform\Core\Api\IriConverter; use ApiPlatform\Core\JsonLd\Response; use ApiPlatform\Core\Model\DataProviderInterface; @@ -23,7 +25,7 @@ */ class RequestExceptionListener extends \ApiPlatform\Core\Hydra\EventListener\RequestExceptionListener { - use ActionUtilTrait; +// use ActionUtilTrait; const FORMAT = 'jsonld'; diff --git a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php index e57a91f1d..ca3c938c1 100644 --- a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php +++ b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\FrontendBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\FrontendBundle\Entity\GridPreset; @@ -11,7 +13,7 @@ class MarkAsDefaultAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -53,7 +55,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /** * @var GridPreset diff --git a/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php b/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php index 63c71a53f..8e77795e7 100644 --- a/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php @@ -2,7 +2,9 @@ namespace PartKeepr\ImageBundle\Controller; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use FOS\RestBundle\Controller\Annotations\RequestParam; use FOS\RestBundle\Controller\Annotations\View; @@ -16,7 +18,7 @@ class TemporaryImageController extends ImageController { - use ActionUtilTrait; +// use ActionUtilTrait; /** * Handles a temporary image upload. @@ -65,7 +67,7 @@ public function uploadAction(Request $request) /** * @var ResourceInterface */ - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $serializedData = $this->get('serializer')->normalize( $image, diff --git a/src/PartKeepr/PartBundle/Action/AddStockAction.php b/src/PartKeepr/PartBundle/Action/AddStockAction.php index ec233c6b0..38e79fef0 100644 --- a/src/PartKeepr/PartBundle/Action/AddStockAction.php +++ b/src/PartKeepr/PartBundle/Action/AddStockAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; @@ -17,7 +19,7 @@ */ class AddStockAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -66,7 +68,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $part = $this->getItem($this->dataProvider, $resourceType, $id); diff --git a/src/PartKeepr/PartBundle/Action/GetPartsAction.php b/src/PartKeepr/PartBundle/Action/GetPartsAction.php index e8bafcafe..56fa638f6 100644 --- a/src/PartKeepr/PartBundle/Action/GetPartsAction.php +++ b/src/PartKeepr/PartBundle/Action/GetPartsAction.php @@ -3,7 +3,10 @@ namespace PartKeepr\PartBundle\Action; use Doctrine\ORM\EntityManager; -use ApiPlatform\Core\Action\ActionUtilTrait; + +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\PartBundle\Entity\Part; @@ -17,7 +20,7 @@ */ class GetPartsAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -62,7 +65,7 @@ public function __construct(DataProviderInterface $dataProvider, EntityManager $ **/ public function __invoke(Request $request) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $items = $this->dataProvider->getCollection($resourceType); diff --git a/src/PartKeepr/PartBundle/Action/PartPostAction.php b/src/PartKeepr/PartBundle/Action/PartPostAction.php index 8d3d21915..806508644 100644 --- a/src/PartKeepr/PartBundle/Action/PartPostAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPostAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\PartBundle\Entity\Part; @@ -14,7 +16,7 @@ class PartPostAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var SerializerInterface @@ -64,7 +66,7 @@ public function __invoke(Request $request) /** * @var ResourceInterface */ - list($resourceType, $format) = $this->extractAttributes($request); + list($resourceType, $format) = RequestAttributesExtractor::extractAttributes($request); /** * @var Part diff --git a/src/PartKeepr/PartBundle/Action/PartPutAction.php b/src/PartKeepr/PartBundle/Action/PartPutAction.php index a10280260..9f10ec750 100644 --- a/src/PartKeepr/PartBundle/Action/PartPutAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPutAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; @@ -17,7 +19,7 @@ class PartPutAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -72,7 +74,7 @@ public function __invoke(Request $request, $id) /** * @var ResourceInterface */ - list($resourceType, $format) = $this->extractAttributes($request); + list($resourceType, $format) = RequestAttributesExtractor::extractAttributes($request); /* * Workaround to ensure stockLevels are not overwritten in a PUT request. diff --git a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php index efb6c0f3a..a55f91029 100644 --- a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php +++ b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; @@ -17,7 +19,7 @@ */ class RemoveStockAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -66,7 +68,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $part = $this->getItem($this->dataProvider, $resourceType, $id); diff --git a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php index c4dedc2bf..25e0f10be 100644 --- a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php +++ b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\PartBundle\Entity\PartMeasurementUnit; @@ -11,7 +13,7 @@ class SetDefaultUnitAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var PartMeasurementUnitService @@ -51,7 +53,7 @@ public function __construct(DataProviderInterface $dataProvider, PartMeasurement **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /** * @var PartMeasurementUnit diff --git a/src/PartKeepr/PartBundle/Action/SetStockAction.php b/src/PartKeepr/PartBundle/Action/SetStockAction.php index 70173d508..8c05ce022 100644 --- a/src/PartKeepr/PartBundle/Action/SetStockAction.php +++ b/src/PartKeepr/PartBundle/Action/SetStockAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\PartBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; @@ -17,7 +19,7 @@ */ class SetStockAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -66,7 +68,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $part = $this->getItem($this->dataProvider, $resourceType, $id); diff --git a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php index 4398c441d..b00e7c0a9 100644 --- a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php +++ b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php @@ -2,7 +2,9 @@ namespace PartKeepr\ProjectBundle\Controller; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use FOS\RestBundle\Controller\FOSRestController; use PartKeepr\ProjectBundle\Entity\ProjectPart; @@ -11,7 +13,7 @@ class ProjectReportController extends FOSRestController { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @param Request $request @@ -35,7 +37,7 @@ public function createReportAction(Request $request) /** * @var ResourceInterface */ - list($resourceType, $format) = $this->extractAttributes($request); + list($resourceType, $format) = RequestAttributesExtractor::extractAttributes($request); $report = $this->get("api_platform.serializer")->deserialize( $request->getContent(), $resourceType->getEntityClass(), diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php index 54c2035be..04b8120d2 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php @@ -2,7 +2,8 @@ namespace PartKeepr\SystemPreferenceBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +// use ApiPlatform\Core\Action\ActionUtilTrait; + use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use PartKeepr\SystemPreferenceBundle\Service\SystemPreferenceService; @@ -13,7 +14,7 @@ */ class DeletePreferenceAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var SystemPreferenceService diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php index a0aa096e0..4a3293229 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\SystemPreferenceBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; @@ -16,7 +18,7 @@ */ class GetPreferencesAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var SystemPreferenceService @@ -62,7 +64,7 @@ public function __invoke(Request $request) /** * @var ResourceInterface */ - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); /* * @var ResourceInterface $resourceType diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php index 702cbf2e6..577bffd97 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\SystemPreferenceBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; @@ -16,7 +18,7 @@ */ class SetPreferenceAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var SystemPreferenceService @@ -82,7 +84,7 @@ public function __invoke(Request $request) /** * @var ResourceInterface */ - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $serializedData = $this->serializer->normalize( $preference, diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php index bc172584a..d308f771b 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php @@ -2,7 +2,9 @@ namespace PartKeepr\TipOfTheDayBundle\Action; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; @@ -11,7 +13,7 @@ class GetTipHistoryCollectionAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -50,7 +52,7 @@ public function __construct(DataProviderInterface $dataProvider, UserService $us **/ public function __invoke(Request $request) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $collection = $this->dataProvider->getCollection($resourceType); $user = $this->userService->getUser(); diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php index a36c31f75..1ec7ce4d1 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php @@ -3,7 +3,10 @@ namespace PartKeepr\TipOfTheDayBundle\Action; use Doctrine\ORM\EntityManager; -use ApiPlatform\Core\Action\ActionUtilTrait; + +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; @@ -13,7 +16,7 @@ class MarkTipReadAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var DataProviderInterface @@ -62,7 +65,7 @@ public function __construct( **/ public function __invoke(Request $request, $id) { - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $tip = $this->getItem($this->dataProvider, $resourceType, $id); diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php index 8ac3eac64..d991ba574 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php @@ -3,7 +3,9 @@ namespace PartKeepr\TipOfTheDayBundle\Action; use Doctrine\ORM\EntityManager; -use ApiPlatform\Core\Action\ActionUtilTrait; + +// use ApiPlatform\Core\Action\ActionUtilTrait; + use ApiPlatform\Core\Exception\RuntimeException; use PartKeepr\AuthBundle\Services\UserService; use Symfony\Component\HttpFoundation\Request; @@ -11,7 +13,7 @@ class MarkTipsAsUnreadAction { - use ActionUtilTrait; +// use ActionUtilTrait; /** * @var EntityManager diff --git a/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php b/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php index b8166a7b0..735d3bd5c 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php @@ -2,7 +2,9 @@ namespace PartKeepr\UploadedFileBundle\Controller; -use ApiPlatform\Core\Action\ActionUtilTrait; +//use ApiPlatform\Core\Action\ActionUtilTrait; +use ApiPlatform\Core\Util\RequestAttributesExtractor; + use ApiPlatform\Core\Api\ResourceInterface; use FOS\RestBundle\Controller\Annotations\RequestParam; use FOS\RestBundle\Controller\Annotations\View; @@ -17,7 +19,7 @@ class TemporaryFileController extends FileController { - use ActionUtilTrait; +// use ActionUtilTrait; /** * Handles a temporary file upload. @@ -95,7 +97,7 @@ public function uploadAction(Request $request) /** * @var ResourceInterface */ - list($resourceType) = $this->extractAttributes($request); + list($resourceType) = RequestAttributesExtractor::extractAttributes($request); $serializedData = $this->get('serializer')->normalize( $uploadedFile, From 8888ee5876a53f3b40ac9cb22c3726285aa87959 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 16:11:35 +0200 Subject: [PATCH 118/140] fix Route annotations --- .../Action/ChangePasswordAction.php | 6 +-- .../Action/DeletePreferenceAction.php | 7 ++- .../AuthBundle/Action/DeleteUserAction.php | 7 ++- .../Action/GetPreferencesAction.php | 7 ++- .../AuthBundle/Action/LoginAction.php | 7 ++- .../AuthBundle/Action/PostUserAction.php | 7 ++- .../AuthBundle/Action/PutUserAction.php | 7 ++- .../AuthBundle/Action/SetPreferenceAction.php | 13 ++--- src/PartKeepr/AuthBundle/Entity/User.php | 7 ++- .../Action/ExecuteBatchJobAction.php | 7 ++- .../Action/GetRootNodeAction.php | 17 +++---- .../CategoryBundle/Action/MoveAction.php | 19 +++---- .../Action/SystemNoticeAcknowledgeAction.php | 7 ++- .../Controller/CronRunnerController.php | 3 +- .../Action/MarkAsDefaultAction.php | 7 ++- .../Auth/HTTPBasicAuthenticationProvider.js | 8 ++- .../Auth/WSSEAuthenticationProvider.js | 8 ++- .../Controller/ImageController.php | 37 +++++--------- .../Controller/TemporaryImageController.php | 14 +++--- .../Controller/ImportController.php | 18 ++++--- .../PartBundle/Action/AddStockAction.php | 7 ++- .../PartBundle/Action/GetPartsAction.php | 7 ++- .../PartBundle/Action/PartPostAction.php | 7 ++- .../PartBundle/Action/PartPutAction.php | 7 ++- .../PartBundle/Action/RemoveStockAction.php | 7 ++- .../Action/SetDefaultUnitAction.php | 7 ++- .../PartBundle/Action/SetStockAction.php | 7 ++- .../Controller/ProjectReportController.php | 13 ++--- .../ExistingUserSetupController.php | 3 +- .../Controller/FileMigrationController.php | 3 +- .../Controller/SiPrefixSetupController.php | 1 + .../Action/DeletePreferenceAction.php | 7 ++- .../Action/GetPreferencesAction.php | 7 ++- .../Action/SetPreferenceAction.php | 13 ++--- .../Action/GetTipHistoryCollectionAction.php | 7 ++- .../Action/MarkTipReadAction.php | 7 ++- .../Action/MarkTipsAsUnreadAction.php | 7 ++- .../Controller/FileController.php | 50 +++++++------------ .../Controller/TemporaryFileController.php | 14 +++--- 39 files changed, 172 insertions(+), 222 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php b/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php index 538a08bee..2ffe9895a 100644 --- a/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php +++ b/src/PartKeepr/AuthBundle/Action/ChangePasswordAction.php @@ -56,15 +56,13 @@ public function __construct( $this->container = $container; } - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.auth.change_password" # Controller /** * @Route( * name="PartKeeprAuthChangePassword", * path="/users/{id}/changePassword", - * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="change_password"} + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="change_password"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php b/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php index c54b83ec2..411398a8a 100644 --- a/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeletePreferenceAction.php @@ -9,6 +9,7 @@ use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -45,15 +46,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user_preference.delete_preference" # Controller /** * @Route( * name="PartKeeprUserPreferenceDelete", * path="/user_preferences", - * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_preference"} + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_preference"}, + * methods={"DELETE"} * ) - * @Method("DELETE") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php index c8699e138..23755927b 100644 --- a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php @@ -13,6 +13,7 @@ use PartKeepr\AuthBundle\Services\UserService; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Symfony\Component\Routing\Annotation\Route; /** * Custom API action deleting an user. @@ -58,15 +59,13 @@ public function __construct( * * @return mixed */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user.delete" # Controller /** * @Route( * name="PartKeeprUserDelete", * path="/users/{id}", - * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_custom"} + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="delete_custom"}, + * methods={"DELETE"} * ) - * @Method("DELETE") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php b/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php index 5e02f9024..35441586d 100644 --- a/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php +++ b/src/PartKeepr/AuthBundle/Action/GetPreferencesAction.php @@ -13,6 +13,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -55,15 +56,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user_preference.get_preferences" # Controller /** * @Route( * name="PartKeeprUserPreferenceGet", * path="/user_preferences", - * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="get_preferences"} + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="get_preferences"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/AuthBundle/Action/LoginAction.php b/src/PartKeepr/AuthBundle/Action/LoginAction.php index 63de2c2ff..368b3fca6 100644 --- a/src/PartKeepr/AuthBundle/Action/LoginAction.php +++ b/src/PartKeepr/AuthBundle/Action/LoginAction.php @@ -8,6 +8,7 @@ use PartKeepr\AuthBundle\Services\UserService; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Routing\Annotation\Route; class LoginAction { @@ -38,15 +39,13 @@ public function __construct( $this->userPreferenceService = $userPreferenceService; } - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.auth.login" # Controller /** * @Route( * name="PartKeeprAuthLogin", * path="/users/login", - * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="login"} + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="login"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/AuthBundle/Action/PostUserAction.php b/src/PartKeepr/AuthBundle/Action/PostUserAction.php index 33408a339..27179a96d 100644 --- a/src/PartKeepr/AuthBundle/Action/PostUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PostUserAction.php @@ -14,6 +14,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Serializer\SerializerInterface; +use Symfony\Component\Routing\Annotation\Route; class PostUserAction { @@ -55,15 +56,13 @@ public function __construct( * * @return mixed */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user.post" # Controller /** * @Route( * name="PartKeeprUserPost", * path="/users", - * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="post_custom"} + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="post_custom"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/AuthBundle/Action/PutUserAction.php b/src/PartKeepr/AuthBundle/Action/PutUserAction.php index 0d29f47b7..d1538c983 100644 --- a/src/PartKeepr/AuthBundle/Action/PutUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PutUserAction.php @@ -15,6 +15,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Serializer\SerializerInterface; +use Symfony\Component\Routing\Annotation\Route; class PutUserAction { @@ -58,15 +59,13 @@ public function __construct( * * @return mixed */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user.put" # Controller /** * @Route( * name="PartKeeprUserPut", * path="/users/{id}", - * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="put_custom"} + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="put_custom"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php b/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php index 83d143700..b0e592166 100644 --- a/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php +++ b/src/PartKeepr/AuthBundle/Action/SetPreferenceAction.php @@ -13,6 +13,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -56,25 +57,21 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user_preference.set_preference" # Controller /** * @Route( * name="PartKeeprUserPreferenceSet", * path="/user_preferences", - * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"}, + * methods={"POST"} * ) - * @Method("POST") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.user_preference.set_preference" # Controller /** * @Route( * name="PartKeeprUserPreferenceSet", * path="/user_preferences", - * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"} + * defaults={"_api_resource_class"=User::class, "_api_collection_operation_name"="set_preference"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/AuthBundle/Entity/User.php b/src/PartKeepr/AuthBundle/Entity/User.php index 9d5ff1849..af9b6c274 100644 --- a/src/PartKeepr/AuthBundle/Entity/User.php +++ b/src/PartKeepr/AuthBundle/Entity/User.php @@ -11,6 +11,7 @@ use Symfony\Component\Security\Core\User\EquatableInterface; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Routing\Annotation\Route; /** * @ApiResource( @@ -258,15 +259,13 @@ public function setEmail($email) * * @return UserProvider */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.auth.get_providers" # Controller /** * @Route( * name="PartKeeprAuthGetProviders", * path="/users/get_user_providers", - * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="get_providers"} + * defaults={"_api_resource_class"=User::class, "_api_item_operation_name"="get_providers"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function getProvider() { diff --git a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php index 30f904b84..a3374c889 100644 --- a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php +++ b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php @@ -17,6 +17,7 @@ use PartKeepr\DoctrineReflectionBundle\Services\ReflectionService; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\PropertyAccess\PropertyAccess; +use Symfony\Component\Routing\Annotation\Route; class ExecuteBatchJobAction { @@ -71,15 +72,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.batchjob.execute" # Controller /** * @Route( * name="BatchJobExecute", * path="/batch_jobs/{id}/execute", - * defaults={"_api_resource_class"=BatchJob::class, "_api_item_operation_name"="execute"} + * defaults={"_api_resource_class"=BatchJob::class, "_api_item_operation_name"="execute"}, + * methods={"PUT"} * ) - * @Method("PUT") */ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php index 9ec4493a0..20ab0b44e 100644 --- a/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php +++ b/src/PartKeepr/CategoryBundle/Action/GetRootNodeAction.php @@ -11,6 +11,7 @@ use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -38,35 +39,29 @@ public function __construct(ManagerRegistry $manager) * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.category.get_root_node" # Controller /** * @Route( * name="StorageLocationCategoryGetRoot", * path="/storage_location_categories/getExtJSRootNode", - * defaults={"_api_resource_class"=StorageLocationCategory::class, "_api_collection_operation_name"="get_root"} + * defaults={"_api_resource_class"=StorageLocationCategory::class, "_api_collection_operation_name"="get_root"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.category.get_root_node" # Controller /** * @Route( * name="PartKeeprFootprintCategoryGetRootNode", * path="/footprint_categories/getExtJSRootNode", * defaults={"_api_resource_class"=FootprintCategory::class, "_api_collection_operation_name"="get_root"} + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.category.get_root_node" # Controller /** * @Route( * name="PartKeeprPartCategoryGetRootNode", * path="/part_categories/getExtJSRootNode", - * defaults={"_api_resource_class"=PartCategory::class, "_api_collection_operation_name"="get_root"} + * defaults={"_api_resource_class"=PartCategory::class, "_api_collection_operation_name"="get_root"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/CategoryBundle/Action/MoveAction.php b/src/PartKeepr/CategoryBundle/Action/MoveAction.php index 65705b206..b16339407 100644 --- a/src/PartKeepr/CategoryBundle/Action/MoveAction.php +++ b/src/PartKeepr/CategoryBundle/Action/MoveAction.php @@ -14,6 +14,7 @@ use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -56,35 +57,29 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.category.move" # Controller /** * @Route( * name="StorageLocationCategoryMove", * path="/storage_location_categories/{id}/move", - * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="move"} + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="move"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.category.move" # Controller /** * @Route( * name="FootprintCategoryMove", * path="/footprint_categories/{id}/move", - * defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"} + * defaults={"_api_resource_class"=FootprintCategory::class, "_api_item_operation_name"="move"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.category.move" # Controller /** * @Route( * name="PartKeeprPartCategoryMove", * path="/part_categories/{id}/move", - * defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="move"} + * defaults={"_api_resource_class"=PartCategory::class, "_api_item_operation_name"="move"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php index c642c1ffa..ffbd34c82 100644 --- a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php +++ b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php @@ -11,6 +11,7 @@ use ApiPlatform\Core\Model\DataProviderInterface; use PartKeepr\CoreBundle\Entity\SystemNotice; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; class SystemNoticeAcknowledgeAction { @@ -45,15 +46,13 @@ public function __construct( * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.system_notice.acknowledge" # Controller /** * @Route( * name="SystemNoticeAcknowledge", * path="/system_notices/{id}/acknowledge", - * defaults={"_api_resource_class"=SystemNotice::class, "_api_item_operation_name"="acknowledge"} + * defaults={"_api_resource_class"=SystemNotice::class, "_api_item_operation_name"="acknowledge"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/CronLoggerBundle/Controller/CronRunnerController.php b/src/PartKeepr/CronLoggerBundle/Controller/CronRunnerController.php index 614c643d1..75c92d4da 100644 --- a/src/PartKeepr/CronLoggerBundle/Controller/CronRunnerController.php +++ b/src/PartKeepr/CronLoggerBundle/Controller/CronRunnerController.php @@ -3,8 +3,9 @@ namespace PartKeepr\CronLoggerBundle\Controller; use FOS\RestBundle\Controller\FOSRestController; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +// use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; class CronRunnerController extends FOSRestController { diff --git a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php index ca3c938c1..732a15cd2 100644 --- a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php +++ b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php @@ -10,6 +10,7 @@ use PartKeepr\FrontendBundle\Entity\GridPreset; use PartKeepr\FrontendBundle\Services\GridPresetService; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; class MarkAsDefaultAction { @@ -43,15 +44,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.grid_preset.mark_as_default" # Controller /** * @Route( * name="MarkGridPresetAsDefault", * path="/grid_presets/{id}/markAsDefault", - * defaults={"_api_resource_class"=GridPreset::class, "_api_item_operation_name"="markAsDefault"} + * defaults={"_api_resource_class"=GridPreset::class, "_api_item_operation_name"="markAsDefault"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/HTTPBasicAuthenticationProvider.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/HTTPBasicAuthenticationProvider.js index 3ce1c3f67..4fd3d22d2 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/HTTPBasicAuthenticationProvider.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/HTTPBasicAuthenticationProvider.js @@ -5,7 +5,13 @@ Ext.define('PartKeepr.Auth.HTTPBasicAuthenticationProvider', { extend: 'PartKeepr.Auth.AuthenticationProvider', /** - * @method add + * @Route( + * path="/getPreview/", + * methods={"add"} + * ) + **/ + + /** * @inheritdoc PartKeepr.Auth.AuthenticationProvider#getHeaders */ getHeaders: function () diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/WSSEAuthenticationProvider.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/WSSEAuthenticationProvider.js index 20dfdf5a5..03374ed67 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/WSSEAuthenticationProvider.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Auth/WSSEAuthenticationProvider.js @@ -50,7 +50,13 @@ Ext.define('PartKeepr.Auth.WSSEAuthenticationProvider', { }, /** - * @method add + * @Route( + * path="/getPreview/", + * methods={"add"} + * ) + **/ + + /** * @inheritdoc PartKeepr.Auth.AuthenticationProvider#getHeaders */ getHeaders: function () diff --git a/src/PartKeepr/ImageBundle/Controller/ImageController.php b/src/PartKeepr/ImageBundle/Controller/ImageController.php index 68167ac64..50e24e9c7 100644 --- a/src/PartKeepr/ImageBundle/Controller/ImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/ImageController.php @@ -14,6 +14,7 @@ use PartKeepr\UploadedFileBundle\Entity\UploadedFile; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; abstract class ImageController extends FileController { @@ -31,65 +32,53 @@ abstract class ImageController extends FileController * * @return ImageResponse|Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprProjectBundle:ProjectAttachment:getImage" # Controller /** * @Route( * name="ProjectAttachmentGetImage", * path="/project_attachments/{id}/getImage", - * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_image"} + * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_image"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprImageBundle:TemporaryImage:getImage" # Controller /** * @Route( * name="TemporaryImageGet", * path="/temp_images/{id}/getImage", - * defaults={"_api_resource_class"=TempImage::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=TempImage::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprStorageLocationBundle:StorageLocationImage:getImage" # Controller /** * @Route( * name="StorageLocationGetImage", * path="/storage_location_images/{id}/getImage", - * defaults={"_api_resource_class"=StorageLocationImage::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=StorageLocationImage::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprManufacturerBundle:ManufacturerIcLogo:getImage" # Controller /** * @Route( * name="ManufacturerIcLogoGetImage", * path="/manufacturer_i_c_logos/{id}/getImage", - * defaults={"_api_resource_class"=ManufacturerICLogo::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=ManufacturerICLogo::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprPartBundle:PartAttachment:getImage" # Controller /** * @Route( * name="PartAttachmentGetImage", * path="/part_attachments/{id}/getImage", - * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_image"} + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_image"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprFootprintBundle:FootprintImage:getImage" # Controller /** * @Route( * name="FootprintImageGetImage", * path="/footprint_images/{id}/getImage", - * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") */ public function getImageAction(Request $request, $id) { diff --git a/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php b/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php index 8e77795e7..63ad317e4 100644 --- a/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php +++ b/src/PartKeepr/ImageBundle/Controller/TemporaryImageController.php @@ -2,6 +2,8 @@ namespace PartKeepr\ImageBundle\Controller; +use Symfony\Component\Routing\Annotation\Route; + //use ApiPlatform\Core\Action\ActionUtilTrait; use ApiPlatform\Core\Util\RequestAttributesExtractor; @@ -33,15 +35,13 @@ class TemporaryImageController extends ImageController * * @return JsonResponse The JSON response from the temporary image upload */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprImageBundle:TemporaryImage:upload" # Controller /** * @Route( * name="TemporaryImageUpload", * path="/temp_images/upload", - * defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post"} + * defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function uploadAction(Request $request) { @@ -85,15 +85,13 @@ public function uploadAction(Request $request) * * @return Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprImageBundle:TemporaryImage:webcamUpload" # Controller /** * @Route( * name="TemporaryImageUploadWebcam", * path="/temp_images/webcamUpload", - * defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post_webcam"} + * defaults={"_api_resource_class"=TempImage::class, "_api_collection_operation_name"="custom_post_webcam"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function webcamUploadAction(Request $request) { diff --git a/src/PartKeepr/ImportBundle/Controller/ImportController.php b/src/PartKeepr/ImportBundle/Controller/ImportController.php index 5104d8f95..df9bf84eb 100644 --- a/src/PartKeepr/ImportBundle/Controller/ImportController.php +++ b/src/PartKeepr/ImportBundle/Controller/ImportController.php @@ -27,9 +27,12 @@ public function getSourceAction(Request $request) } /** - * @Route("/getPreview/") - * @Method({"POST"}) - * + * @Route( + * path="/getPreview/", + * methods={"POST"} + * ) + **/ + /** * @return JsonResponse */ public function getPreviewAction(Request $request) @@ -55,9 +58,12 @@ public function getPreviewAction(Request $request) } /** - * @Route("/executeImport/") - * @Method({"POST"}) - * + * @Route( + * path="/executeImport/", + * methods={"POST"} + * ) + **/ + /** * @return JsonResponse */ public function importAction(Request $request) diff --git a/src/PartKeepr/PartBundle/Action/AddStockAction.php b/src/PartKeepr/PartBundle/Action/AddStockAction.php index 38e79fef0..b54005be8 100644 --- a/src/PartKeepr/PartBundle/Action/AddStockAction.php +++ b/src/PartKeepr/PartBundle/Action/AddStockAction.php @@ -13,6 +13,7 @@ use PartKeepr\StockBundle\Entity\StockEntry; use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Adds stock to a given part. @@ -56,15 +57,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.part.add_stock" # Controller /** * @Route( * name="PartAddStock", * path="/parts/{id}/addStock", - * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="add_stock"} + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="add_stock"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/PartBundle/Action/GetPartsAction.php b/src/PartKeepr/PartBundle/Action/GetPartsAction.php index 56fa638f6..7b786ebc4 100644 --- a/src/PartKeepr/PartBundle/Action/GetPartsAction.php +++ b/src/PartKeepr/PartBundle/Action/GetPartsAction.php @@ -12,6 +12,7 @@ use PartKeepr\PartBundle\Entity\Part; use PartKeepr\PartBundle\Services\PartService; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Default API action retrieving a collection of resources. @@ -53,15 +54,13 @@ public function __construct(DataProviderInterface $dataProvider, EntityManager $ * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.parts.collection_get" # Controller /** * @Route( * name="PartsGet", * path="/parts", - * defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_get"} + * defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/PartBundle/Action/PartPostAction.php b/src/PartKeepr/PartBundle/Action/PartPostAction.php index 806508644..250530501 100644 --- a/src/PartKeepr/PartBundle/Action/PartPostAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPostAction.php @@ -13,6 +13,7 @@ use PartKeepr\PartBundle\Services\PartService; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\SerializerInterface; +use Symfony\Component\Routing\Annotation\Route; class PartPostAction { @@ -47,15 +48,13 @@ public function __construct( * * @return mixed */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.part.post" # Controller /** * @Route( * name="PartPost", * path="/parts", - * defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_post"} + * defaults={"_api_resource_class"=Part::class, "_api_collection_operation_name"="custom_post"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/PartBundle/Action/PartPutAction.php b/src/PartKeepr/PartBundle/Action/PartPutAction.php index 9f10ec750..dbe47fc86 100644 --- a/src/PartKeepr/PartBundle/Action/PartPutAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPutAction.php @@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Serializer\SerializerInterface; +use Symfony\Component\Routing\Annotation\Route; class PartPutAction { @@ -59,15 +60,13 @@ public function __construct( * * @return mixed */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.part.put" # Controller /** * @Route( * name="PartPut", * path="/parts/{id}", - * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_put"} + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="custom_put"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php index a55f91029..2f1fa9e5e 100644 --- a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php +++ b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php @@ -13,6 +13,7 @@ use PartKeepr\StockBundle\Entity\StockEntry; use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Removes stock for a given part. @@ -56,15 +57,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.part.remove_stock" # Controller /** * @Route( * name="PartRemoveStock", * path="/parts/{id}/removeStock", - * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="remove_stock"} + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="remove_stock"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php index 25e0f10be..0ff87a4be 100644 --- a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php +++ b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php @@ -10,6 +10,7 @@ use PartKeepr\PartBundle\Entity\PartMeasurementUnit; use PartKeepr\PartBundle\Services\PartMeasurementUnitService; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; class SetDefaultUnitAction { @@ -41,15 +42,13 @@ public function __construct(DataProviderInterface $dataProvider, PartMeasurement * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.part_measurement_unit.set_default" # Controller /** * @Route( * name="PartMeasurementUnitSetDefault", * path="/part_measurement_units/{id}/setDefault", - * defaults={"_api_resource_class"=PartMeasurementUnit::class, "_api_item_operation_name"="custom_put"} + * defaults={"_api_resource_class"=PartMeasurementUnit::class, "_api_item_operation_name"="custom_put"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/PartBundle/Action/SetStockAction.php b/src/PartKeepr/PartBundle/Action/SetStockAction.php index 8c05ce022..f1ba630ba 100644 --- a/src/PartKeepr/PartBundle/Action/SetStockAction.php +++ b/src/PartKeepr/PartBundle/Action/SetStockAction.php @@ -13,6 +13,7 @@ use PartKeepr\StockBundle\Entity\StockEntry; use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Sets the stock for a given part. @@ -56,15 +57,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.part.set_stock" # Controller /** * @Route( * name="PartSetStock", * path="/parts/{id}/setStock", - * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="set_stock"} + * defaults={"_api_resource_class"=Part::class, "_api_item_operation_name"="set_stock"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php index b00e7c0a9..bf5757563 100644 --- a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php +++ b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php @@ -10,6 +10,7 @@ use PartKeepr\ProjectBundle\Entity\ProjectPart; use PartKeepr\ProjectBundle\Entity\Report; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; class ProjectReportController extends FOSRestController { @@ -22,15 +23,13 @@ class ProjectReportController extends FOSRestController * * @return \Symfony\Component\HttpFoundation\Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprProjectBundle:ProjectReport:createReport" # Controller /** * @Route( * name="ProjectReportPost", * path="/reports", - * defaults={"_api_resource_class"=Report::class, "_api_collection_operation_name"="custom_post"} + * defaults={"_api_resource_class"=Report::class, "_api_collection_operation_name"="custom_post"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function createReportAction(Request $request) { @@ -84,15 +83,13 @@ public function createReportAction(Request $request) * * @return \Symfony\Component\HttpFoundation\Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprProjectBundle:ProjectReport:getReport" # Controller /** * @Route( * name="ProjectReportGet", * path="/reports/{id}", - * defaults={"_api_resource_class"=Report::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=Report::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function getReportAction(Request $request, $id) { diff --git a/src/PartKeepr/SetupBundle/Controller/ExistingUserSetupController.php b/src/PartKeepr/SetupBundle/Controller/ExistingUserSetupController.php index 35b2d70fb..2605c0cf9 100644 --- a/src/PartKeepr/SetupBundle/Controller/ExistingUserSetupController.php +++ b/src/PartKeepr/SetupBundle/Controller/ExistingUserSetupController.php @@ -2,10 +2,11 @@ namespace PartKeepr\SetupBundle\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +// use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; class ExistingUserSetupController extends SetupBaseController { diff --git a/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php b/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php index a189df71b..d03ba97a8 100644 --- a/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php +++ b/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php @@ -2,10 +2,11 @@ namespace PartKeepr\SetupBundle\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +// use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; class FileMigrationController extends SetupBaseController { diff --git a/src/PartKeepr/SetupBundle/Controller/SiPrefixSetupController.php b/src/PartKeepr/SetupBundle/Controller/SiPrefixSetupController.php index c56b9fd16..0dc4b22a9 100644 --- a/src/PartKeepr/SetupBundle/Controller/SiPrefixSetupController.php +++ b/src/PartKeepr/SetupBundle/Controller/SiPrefixSetupController.php @@ -7,6 +7,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; + class SiPrefixSetupController extends SetupBaseController { /** diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php index 04b8120d2..caa9f4b7a 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/DeletePreferenceAction.php @@ -8,6 +8,7 @@ use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use PartKeepr\SystemPreferenceBundle\Service\SystemPreferenceService; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -38,15 +39,13 @@ public function __construct( * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.system_preference.delete_preference" # Controller /** * @Route( * name="PartKeeprSystemPreferenceDelete", * path="/system_preferences", - * defaults={"_api_resource_class"=SystemPreference::class, "_api_item_operation_name"="delete_preference"} + * defaults={"_api_resource_class"=SystemPreference::class, "_api_item_operation_name"="delete_preference"}, + * methods={"DELETE"} * ) - * @Method("DELETE") **/ public function __invoke(Request $request) diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php index 4a3293229..b61e2aaf3 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/GetPreferencesAction.php @@ -12,6 +12,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -47,15 +48,13 @@ public function __construct( * * @return JsonResponse */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.system_preference.get_preferences" # Controller /** * @Route( * name="PartKeeprSystemPreferenceGet", * path="/system_preferences", - * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="get_preferences"} + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="get_preferences"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php b/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php index 577bffd97..9afb30abe 100644 --- a/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php +++ b/src/PartKeepr/SystemPreferenceBundle/Action/SetPreferenceAction.php @@ -12,6 +12,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Routing\Annotation\Route; /** * Returns the tree root node. @@ -48,25 +49,21 @@ public function __construct( * * @return JsonResponse */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.system_preference.set_preference" # Controller /** * @Route( * name="PartKeeprSystemPreferenceSet", * path="/system_preferences", - * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"}, + * methods={"POST"} * ) - * @Method("POST") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.system_preference.set_preference" # Controller /** * @Route( * name="PartKeeprSystemPreferenceSet", * path="/system_preferences", - * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"} + * defaults={"_api_resource_class"=SystemPreference::class, "_api_collection_operation_name"="set_preference"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php index d308f771b..f4df718e6 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php @@ -10,6 +10,7 @@ use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\TipOfTheDayBundle\Entity\TipOfTheDayHistory; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; class GetTipHistoryCollectionAction { @@ -40,15 +41,13 @@ public function __construct(DataProviderInterface $dataProvider, UserService $us * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.tip_of_the_day_history.collection_get" # Controller /** * @Route( * name="TipHistoriesGet", * path="/tip_of_the_day_histories", - * defaults={"_api_resource_class"=TipOfTheDayHistory::class, "_api_collection_operation_name"="custom_get"} + * defaults={"_api_resource_class"=TipOfTheDayHistory::class, "_api_collection_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php index 1ec7ce4d1..fe28fae1f 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php @@ -2,6 +2,7 @@ namespace PartKeepr\TipOfTheDayBundle\Action; +use Symfony\Component\Routing\Annotation\Route; use Doctrine\ORM\EntityManager; //use ApiPlatform\Core\Action\ActionUtilTrait; @@ -53,15 +54,13 @@ public function __construct( * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.tip_of_the_day.mark_read" # Controller /** * @Route( * name="TipMarkRead", * path="/tip_of_the_days/{id}/markTipRead", - * defaults={"_api_resource_class"=TipOfTheDay, "_api_item_operation_name"="mark_read"} + * defaults={"_api_resource_class"=TipOfTheDay, "_api_item_operation_name"="mark_read"}, + * methods={"PUT"} * ) - * @Method("PUT") **/ public function __invoke(Request $request, $id) { diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php index d991ba574..290775844 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipsAsUnreadAction.php @@ -2,6 +2,7 @@ namespace PartKeepr\TipOfTheDayBundle\Action; +use Symfony\Component\Routing\Annotation\Route; use Doctrine\ORM\EntityManager; // use ApiPlatform\Core\Action\ActionUtilTrait; @@ -40,15 +41,13 @@ public function __construct(EntityManager $entityManager, UserService $userServi * * @return array|\ApiPlatform\Core\Model\PaginatorInterface|\Traversable */ - // ToDo: fix this - move this Route annotation to the correct place - // "partkeepr.tip_of_the_day.mark_all_unread" # Controller /** * @Route( * name="TipMarkAllUnrad", * path="/tip_of_the_days/markAllTipsAsUnread", - * defaults={"_api_resource_class"=TipOfTheDay, "_api_collection_operation_name"="mark_all_unread"} + * defaults={"_api_resource_class"=TipOfTheDay, "_api_collection_operation_name"="mark_all_unread"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function __invoke(Request $request) { diff --git a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php index 6a16311f0..3f576ea71 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/FileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/FileController.php @@ -2,6 +2,8 @@ namespace PartKeepr\UploadedFileBundle\Controller; +use Symfony\Component\Routing\Annotation\Route; + use Doctrine\ORM\EntityManager; use Gaufrette\Exception\FileNotFound; use PartKeepr\UploadedFileBundle\Entity\UploadedFile; @@ -17,45 +19,37 @@ abstract class FileController extends Controller * * @return Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprProjectBundle:ProjectAttachment:getMimeTypeIcon" # Controller /** * @Route( * name="ProjectAttachmentMimeTypeIcon", * path="/project_attachments/{id}/getMimeTypeIcon", - * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_mime"} + * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get_mime"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprUploadedFileBundle:TemporaryFile:getMimeTypeIcon" # Controller /** * @Route( * name="TemporaryFileGetMimeTypeIcon", * path="/temp_uploaded_files/{id}/getMimeTypeIcon", - * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get_mimetype"} + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get_mimetype"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprPartBundle:PartAttachment:getMimeTypeIcon" # Controller /** * @Route( * name="PartAttachmentMimeTypeIcon", * path="/part_attachments/{id}/getMimeTypeIcon", - * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_mime"} + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get_mime"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprFootprintBundle:FootprintAttachment:getMimeTypeIcon" # Controller /** * @Route( * name="FootprintAttachmentMimeTypeIcon", * path="/footprint_attachments/{id}/getMimeTypeIcon", - * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get_mime"} + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get_mime"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function getMimeTypeIconAction($id) { @@ -81,45 +75,37 @@ public function getMimeTypeIconAction($id) * * @return Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprProjectBundle:ProjectAttachment:getFile" # Controller /** * @Route( * name="ProjectAttachmentGet", * path="/project_attachments/{id}/getFile", - * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=ProjectAttachment::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprUploadedFileBundle:TemporaryFile:getFile" # Controller /** * @Route( * name="TemporaryFileGet", * path="/temp_uploaded_files/{id}/getFile", - * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprPartBundle:PartAttachment:getFile" # Controller /** * @Route( * name="PartAttachmentGet", * path="/part_attachments/{id}/getFile", - * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=PartAttachment::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprFootprintBundle:FootprintAttachment:getFile" # Controller /** * @Route( * name="FootprintAttachmentGet", * path="/footprint_attachments/{id}/getFile", - * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"} + * defaults={"_api_resource_class"=FootprintImage::class, "_api_item_operation_name"="custom_get"}, + * methods={"GET"} * ) - * @Method("GET") **/ public function getFileAction($id) { diff --git a/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php b/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php index 735d3bd5c..0d43d13ac 100644 --- a/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php +++ b/src/PartKeepr/UploadedFileBundle/Controller/TemporaryFileController.php @@ -2,6 +2,8 @@ namespace PartKeepr\UploadedFileBundle\Controller; +use Symfony\Component\Routing\Annotation\Route; + //use ApiPlatform\Core\Action\ActionUtilTrait; use ApiPlatform\Core\Util\RequestAttributesExtractor; @@ -34,15 +36,13 @@ class TemporaryFileController extends FileController * * @return JsonResponse The JSON response from the temporary file upload */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprUploadedFileBundle:TemporaryFile:upload" # Controller /** * @Route( * name="TemporaryFileUpload", * path="/temp_uploaded_files/upload", - * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post"} + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function uploadAction(Request $request) { @@ -115,15 +115,13 @@ public function uploadAction(Request $request) * * @return Response */ - // ToDo: fix this - move this Route annotation to the correct place - // "PartKeeprUploadedFileBundle:TemporaryFile:webcamUpload" # Controller /** * @Route( * name="TemporaryFileUploadWebcam", * path="/temp_uploaded_files/webcamUpload", - * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post_webcam"} + * defaults={"_api_resource_class"=TempUploadedFile::class, "_api_collection_operation_name"="custom_post_webcam"}, + * methods={"POST"} * ) - * @Method("POST") **/ public function webcamUploadAction(Request $request) { From 031f140db29728143c8075978927b2b4a66553a9 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 17:23:55 +0200 Subject: [PATCH 119/140] change php version check of setup to <7.5 --- web/setup/tests/check-php.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 web/setup/tests/check-php.php diff --git a/web/setup/tests/check-php.php b/web/setup/tests/check-php.php old mode 100644 new mode 100755 index e13e5d94e..9563e91d6 --- a/web/setup/tests/check-php.php +++ b/web/setup/tests/check-php.php @@ -5,7 +5,7 @@ echo '{"success": false, "message": "PHP Version '.phpversion().' is too old, minimum required version is PHP 7.0.",'; echo '"errors": ["Your PHP Version is too old. The minimum required version is 7.0.0. '; echo 'Read more…"]}'; -} elseif (version_compare(phpversion(), '7.2', '>=')) { +} elseif (version_compare(phpversion(), '7.5', '>=')) { echo '{"success": false, "message": "PHP Version '.phpversion().' is not supported.",'; echo '"errors": ["Your PHP Version is too new. PartKeepr currently only works well with PHP <= 7.1."]}'; } else { From d3349b6545d6f5c6405ffc6ee375eed668a23a08 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 17:53:04 +0200 Subject: [PATCH 120/140] parameters.php (temporarely pushed, to be removed later) --- .gitignore | 7 +++-- app/config/parameters.php | 56 +++++++++++++++++++++++++++++++++ app/config/parameters_setup.php | 56 +++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 2 deletions(-) create mode 100755 app/config/parameters.php create mode 100755 app/config/parameters_setup.php diff --git a/.gitignore b/.gitignore index 2941a8f9e..2c77f3575 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,11 @@ /.web-server-pid /app/config/parameters.yml /app/authkey.php -/app/config/parameters.php -/app/config/parameters_setup.php + +# temporarely enabled for development +# /app/config/parameters.php +# /app/config/parameters_setup.php + /app/cache/* /app/config/parameters.yml /app/logs/* diff --git a/app/config/parameters.php b/app/config/parameters.php new file mode 100755 index 000000000..9435a7c39 --- /dev/null +++ b/app/config/parameters.php @@ -0,0 +1,56 @@ +setParameter('authentication_provider', 'PartKeepr.Auth.HTTPBasicAuthenticationProvider'); +$container->setParameter('cache.doctrine', 'array'); +$container->setParameter('cache.dunglas', false); +$container->setParameter('database_driver', 'pdo_mysql'); +$container->setParameter('database_host', 'localhost'); +$container->setParameter('database_name', 'te_mpe_ep'); +$container->setParameter('database_password', 'daniel'); +$container->setParameter('database_port', 3306); +$container->setParameter('database_user', 'daniel'); +$container->setParameter('fr3d_ldap.driver.accountCanonicalForm', NULL); +$container->setParameter('fr3d_ldap.driver.accountDomainName', NULL); +$container->setParameter('fr3d_ldap.driver.accountDomainNameShort', NULL); +$container->setParameter('fr3d_ldap.driver.accountFilterFormat', NULL); +$container->setParameter('fr3d_ldap.driver.baseDn', ''); +$container->setParameter('fr3d_ldap.driver.bindRequiresDn', false); +$container->setParameter('fr3d_ldap.driver.host', '127.0.0.1'); +$container->setParameter('fr3d_ldap.driver.optReferrals', NULL); +$container->setParameter('fr3d_ldap.driver.password', NULL); +$container->setParameter('fr3d_ldap.driver.port', NULL); +$container->setParameter('fr3d_ldap.driver.useSsl', NULL); +$container->setParameter('fr3d_ldap.driver.useStartTls', NULL); +$container->setParameter('fr3d_ldap.driver.username', NULL); +$container->setParameter('fr3d_ldap.user.attribute.email', 'email'); +$container->setParameter('fr3d_ldap.user.attribute.username', 'samaccountname'); +$container->setParameter('fr3d_ldap.user.baseDn', 'dc=blabla,dc=com'); +$container->setParameter('fr3d_ldap.user.filter', NULL); +$container->setParameter('locale', 'en'); +$container->setParameter('mailer_auth_mode', NULL); +$container->setParameter('mailer_encryption', NULL); +$container->setParameter('mailer_host', NULL); +$container->setParameter('mailer_password', NULL); +$container->setParameter('mailer_port', NULL); +$container->setParameter('mailer_transport', NULL); +$container->setParameter('mailer_user', NULL); +$container->setParameter('partkeepr.auth.max_users', 'unlimited'); +$container->setParameter('partkeepr.category.path_separator', ' ➤ '); +$container->setParameter('partkeepr.cronjob.check', true); +$container->setParameter('partkeepr.filesystem.data_directory', '%kernel.root_dir%/../data/'); +$container->setParameter('partkeepr.filesystem.quota', false); +$container->setParameter('partkeepr.frontend.auto_login.enabled', false); +$container->setParameter('partkeepr.frontend.auto_login.password', 'admin'); +$container->setParameter('partkeepr.frontend.auto_login.username', 'admin'); +$container->setParameter('partkeepr.frontend.base_url', false); +$container->setParameter('partkeepr.frontend.motd', false); +$container->setParameter('partkeepr.maintenance', false); +$container->setParameter('partkeepr.maintenance.message', ''); +$container->setParameter('partkeepr.maintenance.title', ''); +$container->setParameter('partkeepr.octopart.apikey', ''); +$container->setParameter('partkeepr.octopart.limit', '3'); +$container->setParameter('partkeepr.parts.internalpartnumberunique', false); +$container->setParameter('partkeepr.parts.limit', false); +$container->setParameter('partkeepr.patreon.statusuri', 'https://www.partkeepr.org/patreon.json'); +$container->setParameter('partkeepr.upload.limit', false); +$container->setParameter('partkeepr.users.limit', false); +$container->setParameter('secret', 'COAAFJGGLPHPDGGNCNILHFGECFMMACKC'); diff --git a/app/config/parameters_setup.php b/app/config/parameters_setup.php new file mode 100755 index 000000000..9435a7c39 --- /dev/null +++ b/app/config/parameters_setup.php @@ -0,0 +1,56 @@ +setParameter('authentication_provider', 'PartKeepr.Auth.HTTPBasicAuthenticationProvider'); +$container->setParameter('cache.doctrine', 'array'); +$container->setParameter('cache.dunglas', false); +$container->setParameter('database_driver', 'pdo_mysql'); +$container->setParameter('database_host', 'localhost'); +$container->setParameter('database_name', 'te_mpe_ep'); +$container->setParameter('database_password', 'daniel'); +$container->setParameter('database_port', 3306); +$container->setParameter('database_user', 'daniel'); +$container->setParameter('fr3d_ldap.driver.accountCanonicalForm', NULL); +$container->setParameter('fr3d_ldap.driver.accountDomainName', NULL); +$container->setParameter('fr3d_ldap.driver.accountDomainNameShort', NULL); +$container->setParameter('fr3d_ldap.driver.accountFilterFormat', NULL); +$container->setParameter('fr3d_ldap.driver.baseDn', ''); +$container->setParameter('fr3d_ldap.driver.bindRequiresDn', false); +$container->setParameter('fr3d_ldap.driver.host', '127.0.0.1'); +$container->setParameter('fr3d_ldap.driver.optReferrals', NULL); +$container->setParameter('fr3d_ldap.driver.password', NULL); +$container->setParameter('fr3d_ldap.driver.port', NULL); +$container->setParameter('fr3d_ldap.driver.useSsl', NULL); +$container->setParameter('fr3d_ldap.driver.useStartTls', NULL); +$container->setParameter('fr3d_ldap.driver.username', NULL); +$container->setParameter('fr3d_ldap.user.attribute.email', 'email'); +$container->setParameter('fr3d_ldap.user.attribute.username', 'samaccountname'); +$container->setParameter('fr3d_ldap.user.baseDn', 'dc=blabla,dc=com'); +$container->setParameter('fr3d_ldap.user.filter', NULL); +$container->setParameter('locale', 'en'); +$container->setParameter('mailer_auth_mode', NULL); +$container->setParameter('mailer_encryption', NULL); +$container->setParameter('mailer_host', NULL); +$container->setParameter('mailer_password', NULL); +$container->setParameter('mailer_port', NULL); +$container->setParameter('mailer_transport', NULL); +$container->setParameter('mailer_user', NULL); +$container->setParameter('partkeepr.auth.max_users', 'unlimited'); +$container->setParameter('partkeepr.category.path_separator', ' ➤ '); +$container->setParameter('partkeepr.cronjob.check', true); +$container->setParameter('partkeepr.filesystem.data_directory', '%kernel.root_dir%/../data/'); +$container->setParameter('partkeepr.filesystem.quota', false); +$container->setParameter('partkeepr.frontend.auto_login.enabled', false); +$container->setParameter('partkeepr.frontend.auto_login.password', 'admin'); +$container->setParameter('partkeepr.frontend.auto_login.username', 'admin'); +$container->setParameter('partkeepr.frontend.base_url', false); +$container->setParameter('partkeepr.frontend.motd', false); +$container->setParameter('partkeepr.maintenance', false); +$container->setParameter('partkeepr.maintenance.message', ''); +$container->setParameter('partkeepr.maintenance.title', ''); +$container->setParameter('partkeepr.octopart.apikey', ''); +$container->setParameter('partkeepr.octopart.limit', '3'); +$container->setParameter('partkeepr.parts.internalpartnumberunique', false); +$container->setParameter('partkeepr.parts.limit', false); +$container->setParameter('partkeepr.patreon.statusuri', 'https://www.partkeepr.org/patreon.json'); +$container->setParameter('partkeepr.upload.limit', false); +$container->setParameter('partkeepr.users.limit', false); +$container->setParameter('secret', 'COAAFJGGLPHPDGGNCNILHFGECFMMACKC'); From f73b218bd5c7da839d561f287c0c80bbd5172808 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 19:55:45 +0200 Subject: [PATCH 121/140] restore pk github workflow files --- .github/workflows/docker.yml | 1896 +++++++++++++++++++++++++++++- .github/workflows/notify_irc.yml | 1799 +++++++++++++++++++++++++++- 2 files changed, 3607 insertions(+), 88 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d4d7e6284..4f233da6d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,54 +1,1844 @@ -#name: Docker Image Creation -# -#on: -# push: -# branches: -# - master -# tags: -# - '**' -# -#jobs: -# -# base-image: -# -# runs-on: ubuntu-latest -# name: Create the base image -# -# steps: -# - uses: actions/checkout@v2 -# - name: Fetch git tags -# run: git fetch --unshallow origin +refs/tags/*:refs/tags/* -# -# - name: Build the base docker image -# run: docker pull partkeepr/base-dev:latest && docker build docker/base-dev --file docker/base-dev/Dockerfile --cache-from partkeepr/base-dev:latest --tag partkeepr/base-dev:latest -# - name: Tag the base docker image with git hash -# run: docker tag partkeepr/base-dev:latest partkeepr/base-dev:$(git describe) -# - name: Deploy the base docker images -# run: | -# docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }} -# docker push partkeepr/base-dev:latest -# docker push partkeepr/base-dev:$(git describe) -# -# development-image: -# -# runs-on: ubuntu-latest -# needs: base-image -# name: Create the development image -# -# steps: -# - uses: actions/checkout@v2 -# - name: Fetch git tags -# run: git fetch --unshallow origin +refs/tags/*:refs/tags/* -# -# - name: Build development image -# run: | -# docker pull partkeepr/development:latest -# docker build docker/development/app --file docker/development/app/Dockerfile --tag partkeepr/development:latest --build-arg SRC_IMAGE=partkeepr/base-dev:$(git describe) --cache-from partkeepr/development:latest -# - name: Tag the development docker image with git hash -# run: docker tag partkeepr/development:latest partkeepr/development:$(git describe) -# - name: Deploy the development docker images -# run: | -# docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }} -# docker push partkeepr/development:latest -# docker push partkeepr/development:$(git describe) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PartKeepr/docker.yml at symfony_28_to_30 · ghost-from-the-past/PartKeepr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Skip to content + + + + + + + + + +
+ +
+ + + + + +
+ + + +
+ + + + + + + + + +
+
+
+ + + + + + + + + + +
+ +
+ +
+

+ + + / + + PartKeepr + + +

+ + + forked from partkeepr/PartKeepr + + +
+ +
    + +
  • + +
    + + + + + + + + Watch + + + + + +
    +
    +

    Notifications

    + +
    + +
    +
    + + + + + + + + +
    + +
    +
    +     + + +
    +
    + +     + + + +
    • + +
  • +
    +
    + + +
    +
    + + +
    + +
    • + +
  • + + + Fork + + +
    • +
+ +
+ + + + +
+ + +
+
+ + + + +
+ + + + Permalink + + + +
+ +
+
+ + + symfony_28_to_… + + + + +
+
+
+ Switch branches/tags + +
+ + + +
+ +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + +
+ + + + +
+
+ +
+ +
+ +

+ PartKeepr/.github/workflows/docker.yml +

+ + View runs + + + Go to file + + +
+ + + + + + + + + +
+
+
+ + + +
+ +
+
+
 
+
+ +
+
 
+ Cannot retrieve contributors at this time +
+
+ + + + + + + + + + + + + +
+ +
+ + +
+ + 54 lines (43 sloc) + + 1.87 KB +
+ +
+ +
+ + + Raw + + + + + + Blame + + + +
+ +
+ + + + +
+ +
+
+ +
+
+ +
+
+ + + + + +
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
name: Docker Image Creation
+
on:
push:
branches:
- master
tags:
- '**'
+
jobs:
+
base-image:
+
runs-on: ubuntu-latest
name: Create the base image
+
steps:
- uses: actions/checkout@v2
- name: Fetch git tags
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
- name: Build the base docker image
run: docker pull partkeepr/base-dev:latest && docker build docker/base-dev --file docker/base-dev/Dockerfile --cache-from partkeepr/base-dev:latest --tag partkeepr/base-dev:latest
- name: Tag the base docker image with git hash
run: docker tag partkeepr/base-dev:latest partkeepr/base-dev:$(git describe)
- name: Deploy the base docker images
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }}
docker push partkeepr/base-dev:latest
docker push partkeepr/base-dev:$(git describe)
development-image:
runs-on: ubuntu-latest
needs: base-image
name: Create the development image
steps:
- uses: actions/checkout@v2
- name: Fetch git tags
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
- name: Build development image
run: |
docker pull partkeepr/development:latest
docker build docker/development/app --file docker/development/app/Dockerfile --tag partkeepr/development:latest --build-arg SRC_IMAGE=partkeepr/base-dev:$(git describe) --cache-from partkeepr/development:latest
- name: Tag the development docker image with git hash
run: docker tag partkeepr/development:latest partkeepr/development:$(git describe)
- name: Deploy the development docker images
run: |
docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_TOKEN }}
docker push partkeepr/development:latest
docker push partkeepr/development:$(git describe)
+ + + +
+ +
+ + + + +
+ + +
+ + +
 +
+ + +
+ + + +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/.github/workflows/notify_irc.yml b/.github/workflows/notify_irc.yml index f83b3420c..a03458202 100644 --- a/.github/workflows/notify_irc.yml +++ b/.github/workflows/notify_irc.yml @@ -1,35 +1,1764 @@ -# name: "Push Notification" -# on: [push, pull_request, create] -# -# jobs: -# test: -# runs-on: ubuntu-latest -# steps: -# - name: irc push -# uses: rectalogic/notify-irc@v1 -# if: github.event_name == 'push' -# with: -# channel: "#partkeepr" -# nickname: PartKeepr -# password: ${{ secrets.FREENODE_PASSWORD }} -# message: | -# ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} -# ${{ join(github.event.commits.*.message) }} -# - name: irc pull request -# uses: rectalogic/notify-irc@v1 -# if: github.event_name == 'pull_request' -# with: -# channel: "#partkeepr" -# nickname: PartKeepr -# password: ${{ secrets.FREENODE_PASSWORD }} -# message: | -# ${{ github.actor }} opened PR ${{ github.event.html_url }} -# - name: irc tag created -# uses: rectalogic/notify-irc@v1 -# if: github.event_name == 'create' && github.event.ref_type == 'tag' -# with: -# channel: "#partkeepr" -# nickname: PartKeepr -# password: ${{ secrets.FREENODE_PASSWORD }} -# message: | -# ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PartKeepr/notify_irc.yml at symfony_28_to_30 · ghost-from-the-past/PartKeepr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Skip to content + + + + + + + + + +
+ +
+ + + + + +
+ + + +
+ + + + + + + + + +
+
+
+ + + + + + + + + + +
+ +
+ +
+

+ + + / + + PartKeepr + + +

+ + + forked from partkeepr/PartKeepr + + +
+ +
    + +
  • + +
    + + + + + + + + Watch + + + + + +
    +
    +

    Notifications

    + +
    + +
    +
    + + + + + + + + +
    + +
    +
    +     + + +
    +
    + +     + + + +
    • + +
  • +
    +
    + + +
    +
    + + +
    + +
    • + +
  • + + + Fork + + +
    • +
+ +
+ + + + +
+ + +
+
+ + + + +
+ + + + Permalink + + + +
+ +
+
+ + + symfony_28_to_… + + + + +
+
+
+ Switch branches/tags + +
+ + + +
+ +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + +
+ + + + +
+
+ +
+ +
+ +

+ PartKeepr/.github/workflows/notify_irc.yml +

+ + View runs + + + Go to file + + +
+ + + + + + + + + +
+
+
+ + + +
+ +
+
+
 
+
+ +
+
 
+ Cannot retrieve contributors at this time +
+
+ + + + + + + + + + + + + +
+ +
+ + +
+ + 35 lines (34 sloc) + + 1.2 KB +
+ +
+ +
+ + + Raw + + + + + + Blame + + + +
+ +
+ + + + +
+ +
+
+ +
+
+ +
+
+ + + + + +
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
name: "Push Notification"
on: [push, pull_request, create]
+
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: irc push
uses: rectalogic/notify-irc@v1
if: github.event_name == 'push'
with:
channel: "#partkeepr"
nickname: PartKeepr
password: ${{ secrets.FREENODE_PASSWORD }}
message: |
${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }}
${{ join(github.event.commits.*.message) }}
- name: irc pull request
uses: rectalogic/notify-irc@v1
if: github.event_name == 'pull_request'
with:
channel: "#partkeepr"
nickname: PartKeepr
password: ${{ secrets.FREENODE_PASSWORD }}
message: |
${{ github.actor }} opened PR ${{ github.event.html_url }}
- name: irc tag created
uses: rectalogic/notify-irc@v1
if: github.event_name == 'create' && github.event.ref_type == 'tag'
with:
channel: "#partkeepr"
nickname: PartKeepr
password: ${{ secrets.FREENODE_PASSWORD }}
message: |
${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }}
+ + + +
+ +
+ + + + +
+ + +
+ + +
 +
+ + +
+ + + +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + From 9e952e08519fdd2967b0443b6171148e9c0eb724 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 20:42:56 +0200 Subject: [PATCH 122/140] eclipse project renamed with capital P to follow the repo --- .project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.project b/.project index fc756133c..410a657e8 100755 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - partkeepr + Partkeepr From 2aa0a833f680d0adb7dfd32a6dfaed27f345ee36 Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 23:11:02 +0200 Subject: [PATCH 123/140] just correct the message to be coherent 7.4 --- web/setup/tests/check-php.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/setup/tests/check-php.php b/web/setup/tests/check-php.php index 9563e91d6..07c7cb780 100755 --- a/web/setup/tests/check-php.php +++ b/web/setup/tests/check-php.php @@ -7,7 +7,7 @@ echo 'Read more…"]}'; } elseif (version_compare(phpversion(), '7.5', '>=')) { echo '{"success": false, "message": "PHP Version '.phpversion().' is not supported.",'; - echo '"errors": ["Your PHP Version is too new. PartKeepr currently only works well with PHP <= 7.1."]}'; + echo '"errors": ["Your PHP Version is too new. PartKeepr currently only works well with PHP <= 7.4."]}'; } else { echo '{"success": true, "message": "PHP Version '.phpversion().' found"}'; } From 5d31e17b6c15343eb8b471261d5527478d7a834c Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 23:13:12 +0200 Subject: [PATCH 124/140] SymfonyRequirements is now in var dirrectory --- var/SymfonyRequirements.php | 2 +- web/setup/tests/check.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 4a1fcc621..88b70d4c1 100755 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -563,7 +563,7 @@ function_exists('simplexml_import_dom'), try { $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); - $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/var/SymfonyRequirements.php'); } catch (ReflectionException $e) { $contents = ''; } diff --git a/web/setup/tests/check.php b/web/setup/tests/check.php index 461d24917..74a81b92e 100644 --- a/web/setup/tests/check.php +++ b/web/setup/tests/check.php @@ -1,6 +1,6 @@ Date: Sat, 15 May 2021 23:17:59 +0200 Subject: [PATCH 125/140] the cache is now in var directory --- var/cache/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 var/cache/.keep diff --git a/var/cache/.keep b/var/cache/.keep new file mode 100755 index 000000000..e69de29bb From 67f4c129e5e91f8f45842f92c0196975effcb9da Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 15 May 2021 23:24:47 +0200 Subject: [PATCH 126/140] bootstrap.php.cache is now in var directory --- web/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 web/setup.php diff --git a/web/setup.php b/web/setup.php old mode 100644 new mode 100755 index 54a9af237..4232f9f84 --- a/web/setup.php +++ b/web/setup.php @@ -2,7 +2,7 @@ use Symfony\Component\HttpFoundation\Request; -$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; +$loader = require_once __DIR__.'/../var/bootstrap.php.cache'; require_once __DIR__.'/../app/SetupAppKernel.php'; require_once __DIR__.'/../app/AppKernel.php'; From 5b82809ac0f67208c460ed86d5384d85447692b3 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 01:27:53 +0200 Subject: [PATCH 127/140] change boostrap by autoload for load kernel at setup test --- app/SetupAppKernel.php | 48 ++++++++++++++++++++++++++++++++++++++---- web/setup.php | 7 +++--- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/app/SetupAppKernel.php b/app/SetupAppKernel.php index 46fb76063..63b2d17a7 100644 --- a/app/SetupAppKernel.php +++ b/app/SetupAppKernel.php @@ -1,11 +1,12 @@ getEnvironment(), ['dev', 'test'])) { + if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { +// $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); +// $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); $bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle(); } @@ -33,8 +50,31 @@ public function registerBundles() return $bundles; } + /** + * Loads the configuration for an environment. Also loads a custom configuration for non-text environments from + * app/config_config_custom.yml if it exists. + * + * @param $loader LoaderInterface + */ public function registerContainerConfiguration(LoaderInterface $loader) { - $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); + $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); + } + + /** + * Returns any custom bundles for a custom setup. Override this + * method in a custom AppKernel. + * + * @return array + */ + public function getCustomBundles() + { + return []; + } + + public function getRootDir() + { + return __DIR__; } + } diff --git a/web/setup.php b/web/setup.php index 4232f9f84..6a00cb488 100755 --- a/web/setup.php +++ b/web/setup.php @@ -2,10 +2,11 @@ use Symfony\Component\HttpFoundation\Request; -$loader = require_once __DIR__.'/../var/bootstrap.php.cache'; +// $loader = require_once __DIR__ . "/../var/bootstrap.php.cache"; +$loader = require_once __DIR__.'/../vendor/autoload.php'; -require_once __DIR__.'/../app/SetupAppKernel.php'; -require_once __DIR__.'/../app/AppKernel.php'; +require_once __DIR__ . "/../app/SetupAppKernel.php"; +require_once __DIR__ . "/../app/AppKernel.php"; $kernel = new SetupAppKernel('setup', true); $kernel->loadClassCache(); From 072679af96e1ad5f0ea694b3b3b946e147ac922f Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 09:17:33 +0200 Subject: [PATCH 128/140] some missing app/logs changed to app/logs --- web/setup/js/SetupTests/WebserverLogTest.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/setup/js/SetupTests/WebserverLogTest.js b/web/setup/js/SetupTests/WebserverLogTest.js index c66e3b3c7..2a21512fd 100644 --- a/web/setup/js/SetupTests/WebserverLogTest.js +++ b/web/setup/js/SetupTests/WebserverLogTest.js @@ -3,10 +3,10 @@ */ Ext.define('PartKeeprSetup.WebserverLogDirectoryTest', { extend: 'PartKeeprSetup.AbstractTest', - url: '../../app/logs/ignore.json', + url: '../../var/logs/ignore.json', method: 'GET', name: "PHP", - message: "app/logs access check", + message: "var/logs access check", onSuccess: function (response) { try { var responseObj = Ext.decode(response.responseText); @@ -17,7 +17,7 @@ Ext.define('PartKeeprSetup.WebserverLogDirectoryTest', { if (responseObj.message && responseObj.message === "readable") { this.success = false; this.resultMessage = "Web Server misconfiguration"; - this.errors = ['Your app/logs directory is readable. Please either move your web server\'s document root to the web/ directory or configure app/logs to disallow access. For further information please read wiki about how to prevent access to the logs directory']; + this.errors = ['Your var/logs directory is readable. Please either move your web server\'s document root to the web/ directory or configure var/logs to disallow access. For further information please read wiki about how to prevent access to the logs directory']; if (this.callback) { this.callback.appendTestResult(this); @@ -36,7 +36,7 @@ Ext.define('PartKeeprSetup.WebserverLogDirectoryTest', { */ onFailure: function () { this.success = true; - this.resultMessage = "app/logs not readable"; + this.resultMessage = "var/logs not readable"; if (this.callback) { this.callback.appendTestResult(this); From 82a90f86756680ff7bce77167f409d2e7948e950 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 10:02:31 +0200 Subject: [PATCH 129/140] move from geRootDir to getProjectDir as recommended --- app/AppKernel.php | 9 ++------- app/SetupAppKernel.php | 8 +------- .../Command/GenerateEntityCommand.php | 2 +- .../Controller/CacheWarmupSetupController.php | 2 +- .../SetupBundle/Controller/FileMigrationController.php | 4 ++-- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 3740503fa..a12b5cc98 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -81,10 +81,10 @@ public function registerBundles() */ public function registerContainerConfiguration(LoaderInterface $loader) { - $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); + $loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml'); if ($this->getEnvironment() !== 'test') { - $customConfig = $this->getRootDir().'/config/config_custom.yml'; + $customConfig = $this->getProjectDir().'/app/config/config_custom.yml'; if (file_exists($customConfig)) { $loader->load($customConfig); @@ -103,11 +103,6 @@ public function getCustomBundles() return []; } - public function getRootDir() - { - return __DIR__; - } - /** * Override to allow different cache environments set by the environment variable PARTKEEPR_ENVIRONMENT. * diff --git a/app/SetupAppKernel.php b/app/SetupAppKernel.php index 63b2d17a7..ab7150615 100644 --- a/app/SetupAppKernel.php +++ b/app/SetupAppKernel.php @@ -58,7 +58,7 @@ public function registerBundles() */ public function registerContainerConfiguration(LoaderInterface $loader) { - $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); + $loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml'); } /** @@ -71,10 +71,4 @@ public function getCustomBundles() { return []; } - - public function getRootDir() - { - return __DIR__; - } - } diff --git a/src/PartKeepr/DoctrineReflectionBundle/Command/GenerateEntityCommand.php b/src/PartKeepr/DoctrineReflectionBundle/Command/GenerateEntityCommand.php index 60882327c..a0bf63859 100644 --- a/src/PartKeepr/DoctrineReflectionBundle/Command/GenerateEntityCommand.php +++ b/src/PartKeepr/DoctrineReflectionBundle/Command/GenerateEntityCommand.php @@ -18,7 +18,7 @@ public function configure() public function execute(InputInterface $input, OutputInterface $output) { $reflectionService = $this->getContainer()->get('doctrine_reflection_service'); - $cacheDir = $this->getContainer()->get('kernel')->getRootDir().'/../web/bundles/doctrinereflection/'; + $cacheDir = $this->getContainer()->get('kernel')->getProjectDir().'/web/bundles/doctrinereflection/'; $reflectionService->createCache($cacheDir); } } diff --git a/src/PartKeepr/SetupBundle/Controller/CacheWarmupSetupController.php b/src/PartKeepr/SetupBundle/Controller/CacheWarmupSetupController.php index 806ef4c65..b6f93a389 100644 --- a/src/PartKeepr/SetupBundle/Controller/CacheWarmupSetupController.php +++ b/src/PartKeepr/SetupBundle/Controller/CacheWarmupSetupController.php @@ -111,7 +111,7 @@ public function intCacheWarmupAction(Request $request) public function cacheWarmupAction(Request $request) { // Clear old cache. We don't do that directly as it could happen that old files are loaded prior clearing the cache - $cacheDir = $this->get('kernel')->getRootDir().'/cache/prod'; + $cacheDir = $this->get('kernel')->getProjectDir().'/var/cache/prod'; $filesystem = $this->get('filesystem'); $filesystem->remove($cacheDir); diff --git a/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php b/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php index d03ba97a8..46e444b06 100644 --- a/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php +++ b/src/PartKeepr/SetupBundle/Controller/FileMigrationController.php @@ -45,8 +45,8 @@ public function intMigrateFilesAction(Request $request) $legacyConfig = $this->get('partkeepr.setup.config_service')->legacyConfigParser(); - $legacyFilePath = $this->get('kernel')->getRootDir().'/../data/'; - $legacyImagePath = $this->get('kernel')->getRootDir().'/../data/images/'; + $legacyFilePath = $this->get('kernel')->getProjectDir().'/data/'; + $legacyImagePath = $this->get('kernel')->getProjectDir().'/data/images/'; $legacyFileDirectories = ['FootprintAttachment', 'PartAttachment', 'ProjectAttachment']; From 11ac495cd12d39009a4231fe813d2d77fd4870ee Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 10:18:42 +0200 Subject: [PATCH 130/140] something is still looking for SymfonyRequirements.php in /app ... --- var/SymfonyRequirements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index 88b70d4c1..4a1fcc621 100755 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -563,7 +563,7 @@ function_exists('simplexml_import_dom'), try { $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); - $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/var/SymfonyRequirements.php'); + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); } catch (ReflectionException $e) { $contents = ''; } From ee862fa921f42b196eaff2cee1534973b4cc3174 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 10:20:50 +0200 Subject: [PATCH 131/140] comment out require AppKernel when load SetupAppKernel --- web/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/setup.php b/web/setup.php index 6a00cb488..713583949 100755 --- a/web/setup.php +++ b/web/setup.php @@ -6,7 +6,7 @@ $loader = require_once __DIR__.'/../vendor/autoload.php'; require_once __DIR__ . "/../app/SetupAppKernel.php"; -require_once __DIR__ . "/../app/AppKernel.php"; +//require_once __DIR__ . "/../app/AppKernel.php"; $kernel = new SetupAppKernel('setup', true); $kernel->loadClassCache(); From 981453494219c8745c96afcdae77468d0f0f75db Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 10:22:12 +0200 Subject: [PATCH 132/140] seems that I didn't add it correctly SymfonyRequirements.php --- app/SymfonyRequirements.php | 810 ++++++++++++++++++++++++++++++++++++ 1 file changed, 810 insertions(+) create mode 100755 app/SymfonyRequirements.php diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php new file mode 100755 index 000000000..4a1fcc621 --- /dev/null +++ b/app/SymfonyRequirements.php @@ -0,0 +1,810 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +/* + * Users of PHP 5.2 should be able to run the requirements checks. + * This is why the file and all classes must be compatible with PHP 5.2+ + * (e.g. not using namespaces and closures). + * + * ************** CAUTION ************** + * + * DO NOT EDIT THIS FILE as it will be overridden by Composer as part of + * the installation/update process. The original file resides in the + * SensioDistributionBundle. + * + * ************** CAUTION ************** + */ + +/** + * Represents a single PHP requirement, e.g. an installed extension. + * It can be a mandatory requirement or an optional recommendation. + * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration. + * + * @author Tobias Schultze + */ +class Requirement +{ + private $fulfilled; + private $testMessage; + private $helpText; + private $helpHtml; + private $optional; + + /** + * Constructor that initializes the requirement. + * + * @param bool $fulfilled Whether the requirement is fulfilled + * @param string $testMessage The message for testing the requirement + * @param string $helpHtml The help text formatted in HTML for resolving the problem + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param bool $optional Whether this is only an optional recommendation not a mandatory requirement + */ + public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false) + { + $this->fulfilled = (bool) $fulfilled; + $this->testMessage = (string) $testMessage; + $this->helpHtml = (string) $helpHtml; + $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText; + $this->optional = (bool) $optional; + } + + /** + * Returns whether the requirement is fulfilled. + * + * @return bool true if fulfilled, otherwise false + */ + public function isFulfilled() + { + return $this->fulfilled; + } + + /** + * Returns the message for testing the requirement. + * + * @return string The test message + */ + public function getTestMessage() + { + return $this->testMessage; + } + + /** + * Returns the help text for resolving the problem. + * + * @return string The help text + */ + public function getHelpText() + { + return $this->helpText; + } + + /** + * Returns the help text formatted in HTML. + * + * @return string The HTML help + */ + public function getHelpHtml() + { + return $this->helpHtml; + } + + /** + * Returns whether this is only an optional recommendation and not a mandatory requirement. + * + * @return bool true if optional, false if mandatory + */ + public function isOptional() + { + return $this->optional; + } +} + +/** + * Represents a PHP requirement in form of a php.ini configuration. + * + * @author Tobias Schultze + */ +class PhpIniRequirement extends Requirement +{ + /** + * Constructor that initializes the requirement. + * + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param bool $optional Whether this is only an optional recommendation not a mandatory requirement + */ + public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false) + { + $cfgValue = ini_get($cfgName); + + if (is_callable($evaluation)) { + if (null === $testMessage || null === $helpHtml) { + throw new InvalidArgumentException('You must provide the parameters testMessage and helpHtml for a callback evaluation.'); + } + + $fulfilled = call_user_func($evaluation, $cfgValue); + } else { + if (null === $testMessage) { + $testMessage = sprintf('%s %s be %s in php.ini', + $cfgName, + $optional ? 'should' : 'must', + $evaluation ? 'enabled' : 'disabled' + ); + } + + if (null === $helpHtml) { + $helpHtml = sprintf('Set %s to %s in php.ini*.', + $cfgName, + $evaluation ? 'on' : 'off' + ); + } + + $fulfilled = $evaluation == $cfgValue; + } + + parent::__construct($fulfilled || ($approveCfgAbsence && false === $cfgValue), $testMessage, $helpHtml, $helpText, $optional); + } +} + +/** + * A RequirementCollection represents a set of Requirement instances. + * + * @author Tobias Schultze + */ +class RequirementCollection implements IteratorAggregate +{ + /** + * @var Requirement[] + */ + private $requirements = array(); + + /** + * Gets the current RequirementCollection as an Iterator. + * + * @return Traversable A Traversable interface + */ + public function getIterator() + { + return new ArrayIterator($this->requirements); + } + + /** + * Adds a Requirement. + * + * @param Requirement $requirement A Requirement instance + */ + public function add(Requirement $requirement) + { + $this->requirements[] = $requirement; + } + + /** + * Adds a mandatory requirement. + * + * @param bool $fulfilled Whether the requirement is fulfilled + * @param string $testMessage The message for testing the requirement + * @param string $helpHtml The help text formatted in HTML for resolving the problem + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null) + { + $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, false)); + } + + /** + * Adds an optional recommendation. + * + * @param bool $fulfilled Whether the recommendation is fulfilled + * @param string $testMessage The message for testing the recommendation + * @param string $helpHtml The help text formatted in HTML for resolving the problem + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null) + { + $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, true)); + } + + /** + * Adds a mandatory requirement in form of a php.ini configuration. + * + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) + { + $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, false)); + } + + /** + * Adds an optional recommendation in form of a php.ini configuration. + * + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + * Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + */ + public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) + { + $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, true)); + } + + /** + * Adds a requirement collection to the current set of requirements. + * + * @param RequirementCollection $collection A RequirementCollection instance + */ + public function addCollection(RequirementCollection $collection) + { + $this->requirements = array_merge($this->requirements, $collection->all()); + } + + /** + * Returns both requirements and recommendations. + * + * @return Requirement[] + */ + public function all() + { + return $this->requirements; + } + + /** + * Returns all mandatory requirements. + * + * @return Requirement[] + */ + public function getRequirements() + { + $array = array(); + foreach ($this->requirements as $req) { + if (!$req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns the mandatory requirements that were not met. + * + * @return Requirement[] + */ + public function getFailedRequirements() + { + $array = array(); + foreach ($this->requirements as $req) { + if (!$req->isFulfilled() && !$req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns all optional recommendations. + * + * @return Requirement[] + */ + public function getRecommendations() + { + $array = array(); + foreach ($this->requirements as $req) { + if ($req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns the recommendations that were not met. + * + * @return Requirement[] + */ + public function getFailedRecommendations() + { + $array = array(); + foreach ($this->requirements as $req) { + if (!$req->isFulfilled() && $req->isOptional()) { + $array[] = $req; + } + } + + return $array; + } + + /** + * Returns whether a php.ini configuration is not correct. + * + * @return bool php.ini configuration problem? + */ + public function hasPhpIniConfigIssue() + { + foreach ($this->requirements as $req) { + if (!$req->isFulfilled() && $req instanceof PhpIniRequirement) { + return true; + } + } + + return false; + } + + /** + * Returns the PHP configuration file (php.ini) path. + * + * @return string|false php.ini file path + */ + public function getPhpIniConfigPath() + { + return get_cfg_var('cfg_file_path'); + } +} + +/** + * This class specifies all requirements and optional recommendations that + * are necessary to run the Symfony Standard Edition. + * + * @author Tobias Schultze + * @author Fabien Potencier + */ +class SymfonyRequirements extends RequirementCollection +{ + const LEGACY_REQUIRED_PHP_VERSION = '5.3.3'; + const REQUIRED_PHP_VERSION = '5.5.9'; + + /** + * Constructor that initializes the requirements. + */ + public function __construct() + { + /* mandatory requirements follow */ + + $installedPhpVersion = PHP_VERSION; + $requiredPhpVersion = $this->getPhpRequiredVersion(); + + $this->addRecommendation( + $requiredPhpVersion, + 'Vendors should be installed in order to check all requirements.', + 'Run the composer install command.', + 'Run the "composer install" command.' + ); + + if (false !== $requiredPhpVersion) { + $this->addRequirement( + version_compare($installedPhpVersion, $requiredPhpVersion, '>='), + sprintf('PHP version must be at least %s (%s installed)', $requiredPhpVersion, $installedPhpVersion), + sprintf('You are running PHP version "%s", but Symfony needs at least PHP "%s" to run. + Before using Symfony, upgrade your PHP installation, preferably to the latest version.', + $installedPhpVersion, $requiredPhpVersion), + sprintf('Install PHP %s or newer (installed version is %s)', $requiredPhpVersion, $installedPhpVersion) + ); + } + + $this->addRequirement( + version_compare($installedPhpVersion, '5.3.16', '!='), + 'PHP version must not be 5.3.16 as Symfony won\'t work properly with it', + 'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)' + ); + + $this->addRequirement( + is_dir(__DIR__.'/../vendor/composer'), + 'Vendor libraries must be installed', + 'Vendor libraries are missing. Install composer following instructions from http://getcomposer.org/. '. + 'Then run "php composer.phar install" to install them.' + ); + + $cacheDir = is_dir(__DIR__.'/../var/cache') ? __DIR__.'/../var/cache' : __DIR__.'/cache'; + + $this->addRequirement( + is_writable($cacheDir), + 'app/cache/ or var/cache/ directory must be writable', + 'Change the permissions of either "app/cache/" or "var/cache/" directory so that the web server can write into it.' + ); + + $logsDir = is_dir(__DIR__.'/../var/logs') ? __DIR__.'/../var/logs' : __DIR__.'/logs'; + + $this->addRequirement( + is_writable($logsDir), + 'app/logs/ or var/logs/ directory must be writable', + 'Change the permissions of either "app/logs/" or "var/logs/" directory so that the web server can write into it.' + ); + + if (version_compare($installedPhpVersion, '7.0.0', '<')) { + $this->addPhpIniRequirement( + 'date.timezone', true, false, + 'date.timezone setting must be set', + 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).' + ); + } + + if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) { + $this->addRequirement( + in_array(@date_default_timezone_get(), DateTimeZone::listIdentifiers(), true), + sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()), + 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' + ); + } + + $this->addRequirement( + function_exists('iconv'), + 'iconv() must be available', + 'Install and enable the iconv extension.' + ); + + $this->addRequirement( + function_exists('json_encode'), + 'json_encode() must be available', + 'Install and enable the JSON extension.' + ); + + $this->addRequirement( + function_exists('session_start'), + 'session_start() must be available', + 'Install and enable the session extension.' + ); + + $this->addRequirement( + function_exists('ctype_alpha'), + 'ctype_alpha() must be available', + 'Install and enable the ctype extension.' + ); + + $this->addRequirement( + function_exists('token_get_all'), + 'token_get_all() must be available', + 'Install and enable the Tokenizer extension.' + ); + + $this->addRequirement( + function_exists('simplexml_import_dom'), + 'simplexml_import_dom() must be available', + 'Install and enable the SimpleXML extension.' + ); + + if (function_exists('apc_store') && ini_get('apc.enabled')) { + if (version_compare($installedPhpVersion, '5.4.0', '>=')) { + $this->addRequirement( + version_compare(phpversion('apc'), '3.1.13', '>='), + 'APC version must be at least 3.1.13 when using PHP 5.4', + 'Upgrade your APC extension (3.1.13+).' + ); + } else { + $this->addRequirement( + version_compare(phpversion('apc'), '3.0.17', '>='), + 'APC version must be at least 3.0.17', + 'Upgrade your APC extension (3.0.17+).' + ); + } + } + + $this->addPhpIniRequirement('detect_unicode', false); + + if (extension_loaded('suhosin')) { + $this->addPhpIniRequirement( + 'suhosin.executor.include.whitelist', + create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), + false, + 'suhosin.executor.include.whitelist must be configured correctly in php.ini', + 'Add "phar" to suhosin.executor.include.whitelist in php.ini*.' + ); + } + + if (extension_loaded('xdebug')) { + $this->addPhpIniRequirement( + 'xdebug.show_exception_trace', false, true + ); + + $this->addPhpIniRequirement( + 'xdebug.scream', false, true + ); + + $this->addPhpIniRecommendation( + 'xdebug.max_nesting_level', + create_function('$cfgValue', 'return $cfgValue > 100;'), + true, + 'xdebug.max_nesting_level should be above 100 in php.ini', + 'Set "xdebug.max_nesting_level" to e.g. "250" in php.ini* to stop Xdebug\'s infinite recursion protection erroneously throwing a fatal error in your project.' + ); + } + + $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null; + + $this->addRequirement( + null !== $pcreVersion, + 'PCRE extension must be available', + 'Install the PCRE extension (version 8.0+).' + ); + + if (extension_loaded('mbstring')) { + $this->addPhpIniRequirement( + 'mbstring.func_overload', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'string functions should not be overloaded', + 'Set "mbstring.func_overload" to 0 in php.ini* to disable function overloading by the mbstring extension.' + ); + } + + /* optional recommendations follow */ + + if (file_exists(__DIR__.'/../vendor/composer')) { + require_once __DIR__.'/../vendor/autoload.php'; + + try { + $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + + $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); + } catch (ReflectionException $e) { + $contents = ''; + } + $this->addRecommendation( + file_get_contents(__FILE__) === $contents, + 'Requirements file should be up-to-date', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' + ); + } + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.3.4', '>='), + 'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions', + 'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.' + ); + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.3.8', '>='), + 'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156', + 'Install PHP 5.3.8 or newer if your project uses annotations.' + ); + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.4.0', '!='), + 'You should not use PHP 5.4.0 due to the PHP bug #61453', + 'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.' + ); + + $this->addRecommendation( + version_compare($installedPhpVersion, '5.4.11', '>='), + 'When using the logout handler from the Symfony Security Component, you should have at least PHP 5.4.11 due to PHP bug #63379 (as a workaround, you can also set invalidate_session to false in the security logout handler configuration)', + 'Install PHP 5.4.11 or newer if your project uses the logout handler from the Symfony Security Component.' + ); + + $this->addRecommendation( + (version_compare($installedPhpVersion, '5.3.18', '>=') && version_compare($installedPhpVersion, '5.4.0', '<')) + || + version_compare($installedPhpVersion, '5.4.8', '>='), + 'You should use PHP 5.3.18+ or PHP 5.4.8+ to always get nice error messages for fatal errors in the development environment due to PHP bug #61767/#60909', + 'Install PHP 5.3.18+ or PHP 5.4.8+ if you want nice error messages for all fatal errors in the development environment.' + ); + + if (null !== $pcreVersion) { + $this->addRecommendation( + $pcreVersion >= 8.0, + sprintf('PCRE extension should be at least version 8.0 (%s installed)', $pcreVersion), + 'PCRE 8.0+ is preconfigured in PHP since 5.3.2 but you are using an outdated version of it. Symfony probably works anyway but it is recommended to upgrade your PCRE extension.' + ); + } + + $this->addRecommendation( + class_exists('DomDocument'), + 'PHP-DOM and PHP-XML modules should be installed', + 'Install and enable the PHP-DOM and the PHP-XML modules.' + ); + + $this->addRecommendation( + function_exists('mb_strlen'), + 'mb_strlen() should be available', + 'Install and enable the mbstring extension.' + ); + + $this->addRecommendation( + function_exists('utf8_decode'), + 'utf8_decode() should be available', + 'Install and enable the XML extension.' + ); + + $this->addRecommendation( + function_exists('filter_var'), + 'filter_var() should be available', + 'Install and enable the filter extension.' + ); + + if (!defined('PHP_WINDOWS_VERSION_BUILD')) { + $this->addRecommendation( + function_exists('posix_isatty'), + 'posix_isatty() should be available', + 'Install and enable the php_posix extension (used to colorize the CLI output).' + ); + } + + $this->addRecommendation( + extension_loaded('intl'), + 'intl extension should be available', + 'Install and enable the intl extension (used for validators).' + ); + + if (extension_loaded('intl')) { + // in some WAMP server installations, new Collator() returns null + $this->addRecommendation( + null !== new Collator('fr_FR'), + 'intl extension should be correctly configured', + 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.' + ); + + // check for compatible ICU versions (only done when you have the intl extension) + if (defined('INTL_ICU_VERSION')) { + $version = INTL_ICU_VERSION; + } else { + $reflector = new ReflectionExtension('intl'); + + ob_start(); + $reflector->info(); + $output = strip_tags(ob_get_clean()); + + preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches); + $version = $matches[1]; + } + + $this->addRecommendation( + version_compare($version, '4.0', '>='), + 'intl ICU version should be at least 4+', + 'Upgrade your intl extension with a newer ICU version (4+).' + ); + + if (class_exists('Symfony\Component\Intl\Intl')) { + $this->addRecommendation( + \Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion(), + sprintf('intl ICU version installed on your system is outdated (%s) and does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()), + 'To get the latest internationalization data upgrade the ICU system package and the intl PHP extension.' + ); + if (\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion()) { + $this->addRecommendation( + \Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(), + sprintf('intl ICU version installed on your system (%s) does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()), + 'To avoid internationalization data inconsistencies upgrade the symfony/intl component.' + ); + } + } + + $this->addPhpIniRecommendation( + 'intl.error_level', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'intl.error_level should be 0 in php.ini', + 'Set "intl.error_level" to "0" in php.ini* to inhibit the messages when an error occurs in ICU functions.' + ); + } + + $accelerator = + (extension_loaded('eaccelerator') && ini_get('eaccelerator.enable')) + || + (extension_loaded('apc') && ini_get('apc.enabled')) + || + (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable')) + || + (extension_loaded('Zend OPcache') && ini_get('opcache.enable')) + || + (extension_loaded('xcache') && ini_get('xcache.cacher')) + || + (extension_loaded('wincache') && ini_get('wincache.ocenabled')) + ; + + $this->addRecommendation( + $accelerator, + 'a PHP accelerator should be installed', + 'Install and/or enable a PHP accelerator (highly recommended).' + ); + + if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) { + $this->addRecommendation( + $this->getRealpathCacheSize() >= 5 * 1024 * 1024, + 'realpath_cache_size should be at least 5M in php.ini', + 'Setting "realpath_cache_size" to e.g. "5242880" or "5M" in php.ini* may improve performance on Windows significantly in some cases.' + ); + } + + $this->addPhpIniRecommendation('short_open_tag', false); + + $this->addPhpIniRecommendation('magic_quotes_gpc', false, true); + + $this->addPhpIniRecommendation('register_globals', false, true); + + $this->addPhpIniRecommendation('session.auto_start', false); + + $this->addRecommendation( + class_exists('PDO'), + 'PDO should be installed', + 'Install PDO (mandatory for Doctrine).' + ); + + if (class_exists('PDO')) { + $drivers = PDO::getAvailableDrivers(); + $this->addRecommendation( + count($drivers) > 0, + sprintf('PDO should have some drivers installed (currently available: %s)', count($drivers) ? implode(', ', $drivers) : 'none'), + 'Install PDO drivers (mandatory for Doctrine).' + ); + } + } + + /** + * Loads realpath_cache_size from php.ini and converts it to int. + * + * (e.g. 16k is converted to 16384 int) + * + * @return int + */ + protected function getRealpathCacheSize() + { + $size = ini_get('realpath_cache_size'); + $size = trim($size); + $unit = ''; + if (!ctype_digit($size)) { + $unit = strtolower(substr($size, -1, 1)); + $size = (int) substr($size, 0, -1); + } + switch ($unit) { + case 'g': + return $size * 1024 * 1024 * 1024; + case 'm': + return $size * 1024 * 1024; + case 'k': + return $size * 1024; + default: + return (int) $size; + } + } + + /** + * Defines PHP required version from Symfony version. + * + * @return string|false The PHP required version or false if it could not be guessed + */ + protected function getPhpRequiredVersion() + { + if (!file_exists($path = __DIR__.'/../composer.lock')) { + return false; + } + + $composerLock = json_decode(file_get_contents($path), true); + foreach ($composerLock['packages'] as $package) { + $name = $package['name']; + if ('symfony/symfony' !== $name && 'symfony/http-kernel' !== $name) { + continue; + } + + return (int) $package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION; + } + + return false; + } +} From c30ebb4c6f0da79488914d2b097956f2170f4af7 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 15:11:33 +0200 Subject: [PATCH 133/140] message of future deprecation of KERNEL_DIR --- phpunit.xml.dist | 1 + tests/CoreBundle/WebTestCase.php | 1 + 2 files changed, 2 insertions(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ed12578bb..721adfee1 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -20,6 +20,7 @@ + diff --git a/tests/CoreBundle/WebTestCase.php b/tests/CoreBundle/WebTestCase.php index 5077223ea..99a7ae35d 100644 --- a/tests/CoreBundle/WebTestCase.php +++ b/tests/CoreBundle/WebTestCase.php @@ -17,6 +17,7 @@ class WebTestCase extends \Liip\FunctionalTestBundle\Test\WebTestCase { protected static function getKernelClass() { + // KERNEL_DIR is deprecated, Set the KERNEL_CLASS environment variable to the fully-qualified class name of your Kernel instead $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : self::getPhpUnitXmlDir(); $class = 'AppKernel'; From 922f3ba48c1e61afeff429278d92f615a6610f15 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 16:06:43 +0200 Subject: [PATCH 134/140] WARNING temporary comment for debugging - FormatNegotiator (willdurand/Negotiation) the CSV and XLSX formats support needs to be registered in a different way --- src/PartKeepr/AuthBundle/Security/User/LegacyUserProvider.php | 1 + .../ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/PartKeepr/AuthBundle/Security/User/LegacyUserProvider.php b/src/PartKeepr/AuthBundle/Security/User/LegacyUserProvider.php index 37e47a112..0692f6313 100644 --- a/src/PartKeepr/AuthBundle/Security/User/LegacyUserProvider.php +++ b/src/PartKeepr/AuthBundle/Security/User/LegacyUserProvider.php @@ -9,6 +9,7 @@ use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserProviderInterface; +// recomendation : implement UserLoaderInterface for Symf 3 class LegacyUserProvider implements UserProviderInterface { /** diff --git a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php index 4f34b29f4..dcdd18b91 100644 --- a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php +++ b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/CsvFormatPass.php @@ -16,8 +16,10 @@ class CsvFormatPass implements CompilerPassInterface */ public function process(ContainerBuilder $container) { +/* $container->getDefinition('api_platform.negotiator')->addMethodCall('registerFormat', [ 'csv', ['text/comma-separated-values'], true, ]); +*/ } } From fb7f5b30d45cb0cce3ae957cbb861a986f2806fb Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 16:07:52 +0200 Subject: [PATCH 135/140] WARNING temporary comment for debugging - FormatNegotiator (willdurand/Negotiation) the CSV and XLSX formats support needs to be registered in a different way --- .../DependencyInjection/Compiler/XmlExcelFormatPass.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php index c6fd8481f..68fa8e237 100644 --- a/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php +++ b/src/PartKeepr/ExportBundle/DependencyInjection/Compiler/XmlExcelFormatPass.php @@ -17,8 +17,10 @@ class XmlExcelFormatPass implements CompilerPassInterface public function process(ContainerBuilder $container) { +/* $container->getDefinition('api_platform.negotiator')->addMethodCall('registerFormat', [ 'xlsx', ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'], true, ]); +*/ } } From b00e13bcd08ee0ee8882024ee6e06434be7f2daf Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 16:09:00 +0200 Subject: [PATCH 136/140] adjusting the boot of the kernel --- web/app.php | 8 +++++--- web/app_dev.php | 14 ++++++++------ web/setup.php | 10 +++++----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/web/app.php b/web/app.php index 746264b26..7dded0a71 100644 --- a/web/app.php +++ b/web/app.php @@ -1,9 +1,12 @@ loadClassCache(); //$kernel = new AppCache($kernel); $request = Request::createFromGlobals(); $response = $kernel->handle($request); diff --git a/web/app_dev.php b/web/app_dev.php index e720f78ba..d3f3a3fc3 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -1,12 +1,15 @@ loadClassCache(); +$kernel = new AppKernel('prod', false); //$kernel = new AppCache($kernel); $request = Request::createFromGlobals(); $response = $kernel->handle($request); diff --git a/web/setup.php b/web/setup.php index 713583949..5e29b1182 100755 --- a/web/setup.php +++ b/web/setup.php @@ -2,15 +2,15 @@ use Symfony\Component\HttpFoundation\Request; +set_time_limit(0); + // $loader = require_once __DIR__ . "/../var/bootstrap.php.cache"; -$loader = require_once __DIR__.'/../vendor/autoload.php'; -require_once __DIR__ . "/../app/SetupAppKernel.php"; -//require_once __DIR__ . "/../app/AppKernel.php"; +require_once __DIR__ . '/../vendor/autoload.php'; +require_once __DIR__ . "/../app/SetupAppKernel.php"; $kernel = new SetupAppKernel('setup', true); -$kernel->loadClassCache(); $request = Request::createFromGlobals(); $response = $kernel->handle($request); $response->send(); -$kernel->terminate($request, $response); +$kernel->terminate($request, $response); \ No newline at end of file From 0e278e75e76f7b0d0be6947c4c24be20eec45a72 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 19:48:47 +0200 Subject: [PATCH 137/140] snc/redis-bundle to 3.2.4 --- composer.json | 2 +- composer.lock | 45 +++++++++++++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 6d6112aa9..21f606989 100755 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ "sensio/distribution-bundle": "v5.0.25", "sensio/framework-extra-bundle": "v3.0.29", "sonata-project/exporter": "1.7.1", - "snc/redis-bundle": "2.1.13", + "snc/redis-bundle": "3.2.4", "stof/doctrine-extensions-bundle": "v1.3.0", "symfony/assetic-bundle": "v2.8.2", "symfony/monolog-bundle": "v3.4.0", diff --git a/composer.lock b/composer.lock index c3b142a60..1205dd772 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9f1974d0fba17afcca01a8f37c9a3c08", + "content-hash": "c9d546cfd5ae1e6991acd6a24097069b", "packages": [ { "name": "api-platform/core", @@ -3585,29 +3585,39 @@ }, { "name": "snc/redis-bundle", - "version": "2.1.13", + "version": "3.2.4", "source": { "type": "git", "url": "https://github.com/snc/SncRedisBundle.git", - "reference": "7c8652c1811c573ae567c1bcaa5e1c65723c5907" + "reference": "417086eccdd2619f230353fdac952b83bbd0977a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/7c8652c1811c573ae567c1bcaa5e1c65723c5907", - "reference": "7c8652c1811c573ae567c1bcaa5e1c65723c5907", + "url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/417086eccdd2619f230353fdac952b83bbd0977a", + "reference": "417086eccdd2619f230353fdac952b83bbd0977a", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", - "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0", - "symfony/yaml": "^2.7 || ^3.0 || ^4.0" + "php": "^7.1.3", + "symfony/framework-bundle": "^3.4 || ^4.2 || ^5.0", + "symfony/http-foundation": "^3.4 || ^4.2 || ^5.0", + "symfony/yaml": "^3.4 || ^4.2 || ^5.0" }, "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", - "predis/predis": "^1.0", - "symfony/console": "^2.7 || ^3.0 || ^4.0", - "symfony/phpunit-bridge": "^2.7 || ^3.0 || ^4.0" + "doctrine/doctrine-bundle": "^1.11.2 || ^2.0", + "doctrine/orm": "^2.6.4", + "ext-pdo_sqlite": "*", + "phpunit/phpunit": "^7.5", + "predis/predis": "^1.1", + "swiftmailer/swiftmailer": "^6.0", + "symfony/browser-kit": "^3.4 || ^4.2 || ^5.0", + "symfony/console": "^3.4 || ^4.2 || ^5.0", + "symfony/dom-crawler": "^3.4 || ^4.2 || ^5.0", + "symfony/filesystem": "^3.4 || ^4.2 || ^5.0", + "symfony/phpunit-bridge": "^4.3.5", + "symfony/profiler-pack": "^1.0", + "symfony/swiftmailer-bundle": "^2.0 || ^3.0", + "symfony/twig-bundle": "^3.4 || ^4.2 || ^5.0" }, "suggest": { "monolog/monolog": "If you want to use the monolog redis handler.", @@ -3618,13 +3628,16 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { "Snc\\RedisBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3647,7 +3660,7 @@ "redis", "symfony" ], - "time": "2019-12-09T12:56:15+00:00" + "time": "2020-11-07T16:46:54+00:00" }, { "name": "sonata-project/exporter", From b783d2e4dec6e8a1106d193b00349b8aeee87fc8 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 20:25:05 +0200 Subject: [PATCH 138/140] snc/redis-bundle removed, was not in use anyway --- app/config/config_framework.yml | 9 ---- composer.json | 1 - composer.lock | 81 +-------------------------------- 3 files changed, 1 insertion(+), 90 deletions(-) diff --git a/app/config/config_framework.yml b/app/config/config_framework.yml index bfe860695..e0d600c67 100644 --- a/app/config/config_framework.yml +++ b/app/config/config_framework.yml @@ -25,13 +25,4 @@ framework: # directory: '%kernel.cache_dir%/pools' # Only used with cache.adapter.filesystem directory: '/var/www/partkeepr/app/cache' app: cache.adapter.apcu - system: cache.adapter.apcu -# app: cache.adapter.apcu -# app: cache.adapter.filesystem -# system: cache.adapter.system -# pools: -# app.cache.api: -# adapter : [cache.app] -# adapter : [cache.adapter.memcached] -# default_lifetime : 3600 \ No newline at end of file diff --git a/composer.json b/composer.json index 21f606989..5490a972f 100755 --- a/composer.json +++ b/composer.json @@ -62,7 +62,6 @@ "sensio/distribution-bundle": "v5.0.25", "sensio/framework-extra-bundle": "v3.0.29", "sonata-project/exporter": "1.7.1", - "snc/redis-bundle": "3.2.4", "stof/doctrine-extensions-bundle": "v1.3.0", "symfony/assetic-bundle": "v2.8.2", "symfony/monolog-bundle": "v3.4.0", diff --git a/composer.lock b/composer.lock index 1205dd772..8e3a0aa42 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c9d546cfd5ae1e6991acd6a24097069b", + "content-hash": "9f10dbad29eccd40dc4aef5eded2c4a7", "packages": [ { "name": "api-platform/core", @@ -3583,85 +3583,6 @@ "abandoned": "https://github.com/fabpot/local-php-security-checker", "time": "2019-11-01T13:20:14+00:00" }, - { - "name": "snc/redis-bundle", - "version": "3.2.4", - "source": { - "type": "git", - "url": "https://github.com/snc/SncRedisBundle.git", - "reference": "417086eccdd2619f230353fdac952b83bbd0977a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/417086eccdd2619f230353fdac952b83bbd0977a", - "reference": "417086eccdd2619f230353fdac952b83bbd0977a", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/framework-bundle": "^3.4 || ^4.2 || ^5.0", - "symfony/http-foundation": "^3.4 || ^4.2 || ^5.0", - "symfony/yaml": "^3.4 || ^4.2 || ^5.0" - }, - "require-dev": { - "doctrine/doctrine-bundle": "^1.11.2 || ^2.0", - "doctrine/orm": "^2.6.4", - "ext-pdo_sqlite": "*", - "phpunit/phpunit": "^7.5", - "predis/predis": "^1.1", - "swiftmailer/swiftmailer": "^6.0", - "symfony/browser-kit": "^3.4 || ^4.2 || ^5.0", - "symfony/console": "^3.4 || ^4.2 || ^5.0", - "symfony/dom-crawler": "^3.4 || ^4.2 || ^5.0", - "symfony/filesystem": "^3.4 || ^4.2 || ^5.0", - "symfony/phpunit-bridge": "^4.3.5", - "symfony/profiler-pack": "^1.0", - "symfony/swiftmailer-bundle": "^2.0 || ^3.0", - "symfony/twig-bundle": "^3.4 || ^4.2 || ^5.0" - }, - "suggest": { - "monolog/monolog": "If you want to use the monolog redis handler.", - "predis/predis": "If you want to use predis.", - "symfony/console": "If you want to use commands to interact with the redis database", - "symfony/proxy-manager-bridge": "If you want to lazy-load some services" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Snc\\RedisBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Henrik Westphal", - "email": "henrik.westphal@gmail.com" - }, - { - "name": "Community contributors", - "homepage": "https://github.com/snc/SncRedisBundle/contributors" - } - ], - "description": "A Redis bundle for Symfony", - "homepage": "https://github.com/snc/SncRedisBundle", - "keywords": [ - "nosql", - "redis", - "symfony" - ], - "time": "2020-11-07T16:46:54+00:00" - }, { "name": "sonata-project/exporter", "version": "1.7.1", From 6f5dc8f342ecfcea1fa74d8b3ef4f775b8c5f011 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 20:39:31 +0200 Subject: [PATCH 139/140] ApiPlatform\Core\Model\DataProviderInterface replaced by ApiPlatform\Core\DataProvider\ItemDataProviderInterface --- src/PartKeepr/AuthBundle/Action/DeleteUserAction.php | 2 +- src/PartKeepr/AuthBundle/Action/PostUserAction.php | 2 +- src/PartKeepr/AuthBundle/Action/PutUserAction.php | 2 +- src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php | 2 +- src/PartKeepr/CategoryBundle/Action/MoveAction.php | 2 +- .../CoreBundle/Action/SystemNoticeAcknowledgeAction.php | 2 +- src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php | 2 +- src/PartKeepr/PartBundle/Action/AddStockAction.php | 2 +- src/PartKeepr/PartBundle/Action/GetPartsAction.php | 2 +- src/PartKeepr/PartBundle/Action/PartPutAction.php | 2 +- src/PartKeepr/PartBundle/Action/RemoveStockAction.php | 2 +- src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php | 2 +- src/PartKeepr/PartBundle/Action/SetStockAction.php | 2 +- .../TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php | 2 +- src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php index 23755927b..bcc0d8146 100644 --- a/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/DeleteUserAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\AuthBundle\Exceptions\UserProtectedException; use PartKeepr\AuthBundle\Services\UserPreferenceService; diff --git a/src/PartKeepr/AuthBundle/Action/PostUserAction.php b/src/PartKeepr/AuthBundle/Action/PostUserAction.php index 27179a96d..62e133a87 100644 --- a/src/PartKeepr/AuthBundle/Action/PostUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PostUserAction.php @@ -7,7 +7,7 @@ use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\AuthBundle\Exceptions\UserLimitReachedException; use PartKeepr\AuthBundle\Services\UserService; diff --git a/src/PartKeepr/AuthBundle/Action/PutUserAction.php b/src/PartKeepr/AuthBundle/Action/PutUserAction.php index d1538c983..a237a7542 100644 --- a/src/PartKeepr/AuthBundle/Action/PutUserAction.php +++ b/src/PartKeepr/AuthBundle/Action/PutUserAction.php @@ -7,7 +7,7 @@ use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Entity\User; use PartKeepr\AuthBundle\Exceptions\UserLimitReachedException; use PartKeepr\AuthBundle\Exceptions\UserProtectedException; diff --git a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php index a3374c889..c610a9800 100644 --- a/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php +++ b/src/PartKeepr/BatchJobBundle/Action/ExecuteBatchJobAction.php @@ -10,7 +10,7 @@ use ApiPlatform\Core\Api\IriConverter; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\BatchJobBundle\Entity\BatchJob; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use PartKeepr\DoctrineReflectionBundle\Filter\AdvancedSearchFilter; diff --git a/src/PartKeepr/CategoryBundle/Action/MoveAction.php b/src/PartKeepr/CategoryBundle/Action/MoveAction.php index b16339407..41bfeaf4a 100644 --- a/src/PartKeepr/CategoryBundle/Action/MoveAction.php +++ b/src/PartKeepr/CategoryBundle/Action/MoveAction.php @@ -7,7 +7,7 @@ use ApiPlatform\Core\Api\IriConverter; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\CategoryBundle\Exception\MissingParentCategoryException; use PartKeepr\CategoryBundle\Exception\RootMayNotBeMovedException; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; diff --git a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php index ffbd34c82..b91417b7e 100644 --- a/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php +++ b/src/PartKeepr/CoreBundle/Action/SystemNoticeAcknowledgeAction.php @@ -8,7 +8,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\CoreBundle\Entity\SystemNotice; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; diff --git a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php index 732a15cd2..283b5957a 100644 --- a/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php +++ b/src/PartKeepr/FrontendBundle/Action/MarkAsDefaultAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\FrontendBundle\Entity\GridPreset; use PartKeepr\FrontendBundle\Services\GridPresetService; use Symfony\Component\HttpFoundation\Request; diff --git a/src/PartKeepr/PartBundle/Action/AddStockAction.php b/src/PartKeepr/PartBundle/Action/AddStockAction.php index b54005be8..7d6a9fcbb 100644 --- a/src/PartKeepr/PartBundle/Action/AddStockAction.php +++ b/src/PartKeepr/PartBundle/Action/AddStockAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use PartKeepr\PartBundle\Entity\Part; diff --git a/src/PartKeepr/PartBundle/Action/GetPartsAction.php b/src/PartKeepr/PartBundle/Action/GetPartsAction.php index 7b786ebc4..9a4b461df 100644 --- a/src/PartKeepr/PartBundle/Action/GetPartsAction.php +++ b/src/PartKeepr/PartBundle/Action/GetPartsAction.php @@ -8,7 +8,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\PartBundle\Entity\Part; use PartKeepr\PartBundle\Services\PartService; use Symfony\Component\HttpFoundation\Request; diff --git a/src/PartKeepr/PartBundle/Action/PartPutAction.php b/src/PartKeepr/PartBundle/Action/PartPutAction.php index dbe47fc86..52586c2c9 100644 --- a/src/PartKeepr/PartBundle/Action/PartPutAction.php +++ b/src/PartKeepr/PartBundle/Action/PartPutAction.php @@ -7,7 +7,7 @@ use ApiPlatform\Core\Api\ResourceInterface; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Exceptions\UserLimitReachedException; use PartKeepr\AuthBundle\Exceptions\UserProtectedException; use PartKeepr\PartBundle\Entity\Part; diff --git a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php index 2f1fa9e5e..141738468 100644 --- a/src/PartKeepr/PartBundle/Action/RemoveStockAction.php +++ b/src/PartKeepr/PartBundle/Action/RemoveStockAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use PartKeepr\PartBundle\Entity\Part; diff --git a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php index 0ff87a4be..d773d30ab 100644 --- a/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php +++ b/src/PartKeepr/PartBundle/Action/SetDefaultUnitAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\PartBundle\Entity\PartMeasurementUnit; use PartKeepr\PartBundle\Services\PartMeasurementUnitService; use Symfony\Component\HttpFoundation\Request; diff --git a/src/PartKeepr/PartBundle/Action/SetStockAction.php b/src/PartKeepr/PartBundle/Action/SetStockAction.php index f1ba630ba..c03b9557c 100644 --- a/src/PartKeepr/PartBundle/Action/SetStockAction.php +++ b/src/PartKeepr/PartBundle/Action/SetStockAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\CategoryBundle\Exception\RootNodeNotFoundException; use PartKeepr\PartBundle\Entity\Part; diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php index f4df718e6..7ba43e975 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/GetTipHistoryCollectionAction.php @@ -6,7 +6,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\TipOfTheDayBundle\Entity\TipOfTheDayHistory; use Symfony\Component\HttpFoundation\Request; diff --git a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php index fe28fae1f..b901afa60 100644 --- a/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php +++ b/src/PartKeepr/TipOfTheDayBundle/Action/MarkTipReadAction.php @@ -9,7 +9,7 @@ use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Core\Exception\RuntimeException; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\AuthBundle\Services\UserService; use PartKeepr\TipOfTheDayBundle\Entity\TipOfTheDay; use PartKeepr\TipOfTheDayBundle\Entity\TipOfTheDayHistory; From ef36f951e82c1f56adc941740f83622c733cb940 Mon Sep 17 00:00:00 2001 From: daniel Date: Sun, 16 May 2021 20:39:45 +0200 Subject: [PATCH 140/140] ApiPlatform\Core\Model\DataProviderInterface replaced by ApiPlatform\Core\DataProvider\ItemDataProviderInterface (working in this one) --- .../RequestExceptionListener.php | 91 ++++++++++++++++++- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php b/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php index 27808233e..73037dd97 100644 --- a/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php +++ b/src/PartKeepr/CoreBundle/EventListener/RequestExceptionListener.php @@ -12,18 +12,103 @@ // use ApiPlatform\Core\Action\ActionUtilTrait; -use ApiPlatform\Core\Api\IriConverter; +use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\JsonLd\Response; -use ApiPlatform\Core\Model\DataProviderInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use PartKeepr\DoctrineReflectionBundle\Exception\EntityInUseException; use PartKeepr\DoctrineReflectionBundle\Services\DeletionService; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; +// working on this +// PHP Fatal error: Uncaught Symfony\\Component\\Debug\\Exception\\FatalThrowableError: Type error: +// Argument 2 passed to PartKeepr\\CoreBundle\\EventListener\\RequestExceptionListener::__construct() +// must be an instance of ApiPlatform\\Core\\Model\\DataProviderInterface, instance of ApiPlatform\\Core\\DataProvider\\ChainCollectionDataProvider +//----------------------------------------------------------- +// copy from the original \Dunglas\ApiBundle\Hydra\EventListener\RequestExceptionListener + +/* + * This file is part of the DunglasApiBundle package. + * + * (c) Kévin Dunglas + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +//namespace Dunglas\ApiBundle\Hydra\EventListener; + +use ApiPlatform\Core\Exception\InvalidArgumentException; +//use ApiPlatform\Core\Exception\ValidationException; +//use ApiPlatform\Core\JsonLd\Response; +//use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; +use Symfony\Component\HttpKernel\Exception\HttpException; +use Symfony\Component\Serializer\Exception\ExceptionInterface; +//use Symfony\Component\Serializer\Normalizer\NormalizerInterface; + +/** + * Handle requests errors. + * + * @author Samuel ROZE + * @author Kévin Dunglas + */ +class RequestExceptionListener_ +{ + const FORMAT = 'jsonld'; + + /** + * @var NormalizerInterface + */ + private $normalizer; + + public function __construct(NormalizerInterface $normalizer) + { + $this->normalizer = $normalizer; + } + + /** + * @param GetResponseForExceptionEvent $event + */ + public function onKernelException(GetResponseForExceptionEvent $event) + { + $request = $event->getRequest(); + if (!$request->attributes->has('_resource_type') || self::FORMAT !== $request->attributes->get('_api_format')) { + return; + } + + $exception = $event->getException(); + $headers = []; + + if ($exception instanceof HttpException) { + $status = $exception->getStatusCode(); + $headers = $exception->getHeaders(); + $data = $exception; + } elseif ($exception instanceof ValidationException) { + $status = Response::HTTP_BAD_REQUEST; + $data = $exception->getConstraintViolationList(); + } elseif ($exception instanceof ExceptionInterface || $exception instanceof InvalidArgumentException) { + $status = Response::HTTP_BAD_REQUEST; + $data = $exception; + } else { + $status = Response::HTTP_INTERNAL_SERVER_ERROR; + $data = $exception; + } + + $event->setResponse(new Response( + $this->normalizer->normalize($data, 'hydra-error'), + $status, + $headers + )); + } +} +//----------------------------------------------------------- + + /** * Handle referential integrity errors. */ -class RequestExceptionListener extends \ApiPlatform\Core\Hydra\EventListener\RequestExceptionListener +// class RequestExceptionListener extends \ApiPlatform\Core\Hydra\EventListener\RequestExceptionListener +class RequestExceptionListener extends RequestExceptionListener_ { // use ActionUtilTrait;