Skip to content

Commit

Permalink
Merge pull request #373 from Invertus/validator-fix
Browse files Browse the repository at this point in the history
validator fixes
  • Loading branch information
margud committed Jul 8, 2021
2 parents dfd9acb + 2b466dd commit 1795612
Show file tree
Hide file tree
Showing 484 changed files with 20,193 additions and 19,368 deletions.
32 changes: 0 additions & 32 deletions .php_cs

This file was deleted.

14 changes: 14 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$config = new PrestaShop\CodingStandards\CsFixer\Config();

$config
->setUsingCache(true)
->getFinder()
->in(__DIR__)
->exclude('translations')
->exclude('mails')
->exclude('libraries')
->exclude('vendor');

return $config;
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fl: fix-lint
# target: fix-lint - Launch php cs fixer
fix-lint:
docker run --rm -it -w=/app -v ${PWD}:/app oskarstark/php-cs-fixer-ga:latest
docker-compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no"

# All the commands required to build prestashop-17 version locally
bps17: build-ps-17
Expand Down
20 changes: 20 additions & 0 deletions bin/cvs/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
/**
* Mollie https://www.mollie.nl
*
* @author Mollie B.V. <[email protected]>
* @copyright Mollie B.V.
* @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
*
* @see https://github.com/mollie/PrestaShop
* @codingStandardsIgnoreStart
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');

header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');

header('Location: ../');
exit;
2 changes: 1 addition & 1 deletion bin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* International Registered Trademark & Property of INVERTUS, UAB
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');

header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
Expand Down
85 changes: 43 additions & 42 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
{
"name": "mollie/prestashop",
"license": "BSD-2.0",
"description": "Mollie module for PrestaShop",
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-simplexml": "*",
"symfony/polyfill-mbstring": "^1.9",
"symfony/dependency-injection": "^3.4",
"symfony/config": "^3.4",
"symfony/expression-language": "^3.4",
"symfony/yaml": "^3.4",
"prestashop/decimal": "^1.3",
"mollie/mollie-api-php": "dev-master",
"segmentio/analytics-php": "^1.5",
"sentry/sentry": "^1.11.0",
"vlucas/phpdotenv": "3.4"
},
"require-dev": {
"prestashop/php-dev-tools": "^3.0"
},
"autoload-dev": {
"psr-4": {
"Mollie\\Tests\\": "tests/"
}
},
"autoload": {
"psr-4": {
"Mollie\\": "src/"
"name": "mollie/prestashop",
"license": "AFL-3.0",
"description": "Mollie module for PrestaShop",
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-simplexml": "*",
"symfony/polyfill-mbstring": "^1.9",
"symfony/dependency-injection": "^3.4",
"symfony/config": "^3.4",
"symfony/expression-language": "^3.4",
"symfony/yaml": "^3.4",
"prestashop/decimal": "^1.3",
"mollie/mollie-api-php": "dev-master",
"segmentio/analytics-php": "^1.5",
"sentry/sentry": "^1.11.0",
"vlucas/phpdotenv": "3.4"
},
"classmap": [
"mollie.php",
"controllers/",
"src/"
]
},
"config": {
"platform": {
"php": "5.6"
"require-dev": {
"prestashop/php-dev-tools": "^3.0"
},
"prepend-autoloader": false
},
"type": "prestashop-module"
}
"autoload-dev": {
"psr-4": {
"Mollie\\Tests\\": "tests/"
}
},
"autoload": {
"psr-4": {
"Mollie\\": "src/"
},
"classmap": [
"mollie.php",
"controllers/",
"src/"
]
},
"config": {
"platform": {
"php": "5.6"
},
"prepend-autoloader": false
},
"type": "prestashop-module",
"author": "PrestaShop"
}
3 changes: 1 addition & 2 deletions config/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
*
* @author Mollie B.V. <[email protected]>
* @copyright Mollie B.V.
* @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
*
* @see https://github.com/mollie/PrestaShop
*
* @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
* @codingStandardsIgnoreStart
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
Expand Down
Loading

0 comments on commit 1795612

Please sign in to comment.