From 6dbd009e140b0bbc9fa959d9343cb928319f1e89 Mon Sep 17 00:00:00 2001
From: Albin Kester <83301974+stakovicz@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:30:59 +0100
Subject: [PATCH] Rector installation (#1590)
* rector installation before 1st pass
* rector installation 1st pass
---
.gitignore | 10 +-
app/config/config.php | 2 +-
composer.json | 1 +
composer.lock | 273 +++++++++++++-----
db/seeds/Session.php | 4 +-
.../pages/administration/compta_balance.php | 2 +-
htdocs/pages/administration/compta_banque.php | 62 ++--
htdocs/pages/administration/compta_bilan.php | 2 +-
.../administration/compta_conf_categorie.php | 4 +-
.../administration/compta_conf_compte.php | 4 +-
.../administration/compta_conf_evenement.php | 4 +-
.../administration/compta_conf_operation.php | 4 +-
.../administration/compta_conf_regle.php | 12 +-
.../administration/compta_conf_reglement.php | 4 +-
htdocs/pages/administration/compta_devis.php | 62 ++--
.../pages/administration/compta_facture.php | 74 ++---
.../pages/administration/compta_journal.php | 36 +--
.../pages/administration/compta_recherche.php | 2 +-
.../pages/administration/compta_synthese.php | 2 +-
htdocs/pages/administration/cotisations.php | 26 +-
.../administration/forum_facturation.php | 6 +-
.../administration/forum_inscriptions.php | 68 ++---
.../pages/administration/forum_joind_in.php | 6 +-
.../pages/administration/forum_partenaire.php | 12 +-
.../pages/administration/forum_planning.php | 16 +-
.../pages/administration/forum_sessions.php | 36 +--
htdocs/pages/administration/index.php | 2 +-
.../administration/membre_personne_morale.php | 26 +-
htdocs/pages/administration/paybox_annule.php | 2 +-
.../pages/administration/paybox_effectue.php | 2 +-
htdocs/pages/administration/paybox_erreur.php | 2 +-
htdocs/pages/administration/paybox_refuse.php | 2 +-
.../administration/personnes_morales.php | 32 +-
htdocs/pages/administration/site_articles.php | 26 +-
htdocs/pages/administration/site_feuilles.php | 28 +-
htdocs/pages/event-payment/index.php | 2 +-
htdocs/pages/event-payment/paybox_annule.php | 2 +-
.../pages/event-payment/paybox_effectue.php | 2 +-
htdocs/pages/event-payment/paybox_erreur.php | 2 +-
htdocs/pages/event-payment/paybox_refuse.php | 2 +-
htdocs/pages/paiement/index.php | 2 +-
htdocs/pages/paiement/paybox_annule.php | 2 +-
htdocs/pages/paiement/paybox_effectue.php | 2 +-
htdocs/pages/paiement/paybox_erreur.php | 2 +-
htdocs/pages/paiement/paybox_refuse.php | 2 +-
htdocs/pages/paiement/payment_tracking.php | 4 +-
htdocs/templates/planete/images/cron.php | 2 +-
rector.php | 29 ++
.../Controller/SiteBaseController.php | 13 +-
sources/AppBundle/Event/Form/SpeakerType.php | 23 +-
.../Security/MyGithubAuthenticator.php | 23 +-
.../Security/TestGithubAuthenticator.php | 12 +-
52 files changed, 565 insertions(+), 417 deletions(-)
create mode 100644 rector.php
diff --git a/.gitignore b/.gitignore
index bcc91ac88..eb4cb93df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,13 +44,9 @@ js_dist
/var/sessions/*
!var/sessions/.gitkeep
/htdocs/bundles/
-/bin/atoum
-/bin/behat
-/bin/generate_vcards
-/bin/phinx
-/bin/php-cs-fixer
-/bin/simple-phpunit
-/bin/vobject
+/bin/*
+!/bin/console
+!/bin/doctrine-dbal
/compose.override.yml
/composer.phar
/data
diff --git a/app/config/config.php b/app/config/config.php
index bd92767ba..fe2fbbf87 100644
--- a/app/config/config.php
+++ b/app/config/config.php
@@ -13,7 +13,7 @@
continue;
}
- list($name, $default) = explode('=', $line, 2);
+ [$name, $default] = explode('=', $line, 2);
// On va chercher dans les variables d'env en premier
if (!$value = getenv($name)) {
$value = $default;
diff --git a/composer.json b/composer.json
index e929a557b..892a43269 100644
--- a/composer.json
+++ b/composer.json
@@ -97,6 +97,7 @@
"behat/mink-extension": "^2.3",
"behat/mink-goutte-driver": "^1.2",
"friendsofphp/php-cs-fixer": "~2",
+ "rector/rector": "^2.0",
"smalot/pdfparser": "^0.19.0"
},
"repositories": [
diff --git a/composer.lock b/composer.lock
index e3f38fc29..00fa2c9c2 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": "fea777344ac6b15ff67a19f4639cce3e",
+ "content-hash": "6987c8511259e54a95e24b8d9818e0a1",
"packages": [
{
"name": "algolia/algoliasearch-client-php",
@@ -1860,20 +1860,20 @@
},
{
"name": "ezyang/htmlpurifier",
- "version": "v4.17.0",
+ "version": "v4.18.0",
"source": {
"type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git",
- "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
+ "reference": "cb56001e54359df7ae76dc522d08845dc741621b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
- "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+ "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/cb56001e54359df7ae76dc522d08845dc741621b",
+ "reference": "cb56001e54359df7ae76dc522d08845dc741621b",
"shasum": ""
},
"require": {
- "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+ "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
"cerdic/css-tidy": "^1.7 || ^2.0",
@@ -1915,9 +1915,9 @@
],
"support": {
"issues": "https://github.com/ezyang/htmlpurifier/issues",
- "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
+ "source": "https://github.com/ezyang/htmlpurifier/tree/v4.18.0"
},
- "time": "2023-11-17T15:01:25+00:00"
+ "time": "2024-11-01T03:51:45+00:00"
},
{
"name": "fig/link-util",
@@ -2716,6 +2716,7 @@
"issues": "https://github.com/J7mbo/twitter-api-php/issues",
"source": "https://github.com/J7mbo/twitter-api-php/tree/master"
},
+ "abandoned": true,
"time": "2017-05-08T12:10:56+00:00"
},
{
@@ -3028,29 +3029,32 @@
},
{
"name": "league/iso3166",
- "version": "4.3.1",
+ "version": "4.3.2",
"source": {
"type": "git",
- "url": "https://github.com/thephpleague/iso3166.git",
- "reference": "11703e0313f34920add11c0228f0dd43ebd10f9a"
+ "url": "https://github.com/alcohol/iso3166.git",
+ "reference": "5133fed7d54728222f4058702487dccedda20472"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/iso3166/zipball/11703e0313f34920add11c0228f0dd43ebd10f9a",
- "reference": "11703e0313f34920add11c0228f0dd43ebd10f9a",
+ "url": "https://api.github.com/repos/alcohol/iso3166/zipball/5133fed7d54728222f4058702487dccedda20472",
+ "reference": "5133fed7d54728222f4058702487dccedda20472",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "php": "^7.3|^8.0"
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5"
+ "phpstan/phpstan": "^1.12.6",
+ "phpstan/phpstan-deprecation-rules": "^1.2.1",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
+ "phpunit/phpunit": "^9.6.21"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev"
+ "dev-master": "4.x-dev"
}
},
"autoload": {
@@ -3069,7 +3073,7 @@
}
],
"description": "ISO 3166-1 PHP Library",
- "homepage": "https://github.com/thephpleague/iso3166",
+ "homepage": "https://github.com/alcohol/iso3166",
"keywords": [
"3166",
"3166-1",
@@ -3079,10 +3083,16 @@
"library"
],
"support": {
- "issues": "https://github.com/thephpleague/iso3166/issues",
- "source": "https://github.com/thephpleague/iso3166"
+ "issues": "https://github.com/alcohol/iso3166/issues",
+ "source": "https://github.com/alcohol/iso3166"
},
- "time": "2023-09-11T07:59:36+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/alcohol",
+ "type": "github"
+ }
+ ],
+ "time": "2024-10-10T07:39:24+00:00"
},
{
"name": "league/oauth2-client",
@@ -3484,16 +3494,16 @@
},
{
"name": "myclabs/php-enum",
- "version": "1.8.4",
+ "version": "1.8.5",
"source": {
"type": "git",
"url": "https://github.com/myclabs/php-enum.git",
- "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483"
+ "reference": "e7be26966b7398204a234f8673fdad5ac6277802"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483",
- "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483",
+ "url": "https://api.github.com/repos/myclabs/php-enum/zipball/e7be26966b7398204a234f8673fdad5ac6277802",
+ "reference": "e7be26966b7398204a234f8673fdad5ac6277802",
"shasum": ""
},
"require": {
@@ -3503,7 +3513,7 @@
"require-dev": {
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "1.*",
- "vimeo/psalm": "^4.6.2"
+ "vimeo/psalm": "^4.6.2 || ^5.2"
},
"type": "library",
"autoload": {
@@ -3525,13 +3535,13 @@
}
],
"description": "PHP Enum implementation",
- "homepage": "http://github.com/myclabs/php-enum",
+ "homepage": "https://github.com/myclabs/php-enum",
"keywords": [
"enum"
],
"support": {
"issues": "https://github.com/myclabs/php-enum/issues",
- "source": "https://github.com/myclabs/php-enum/tree/1.8.4"
+ "source": "https://github.com/myclabs/php-enum/tree/1.8.5"
},
"funding": [
{
@@ -3543,20 +3553,20 @@
"type": "tidelift"
}
],
- "time": "2022-08-04T09:53:51+00:00"
+ "time": "2025-01-14T11:49:03+00:00"
},
{
"name": "nesbot/carbon",
- "version": "2.72.5",
+ "version": "2.72.6",
"source": {
"type": "git",
- "url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
+ "url": "https://github.com/CarbonPHP/carbon.git",
+ "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
- "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
+ "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
+ "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
"shasum": ""
},
"require": {
@@ -3576,7 +3586,7 @@
"doctrine/orm": "^2.7 || ^3.0",
"friendsofphp/php-cs-fixer": "^3.0",
"kylekatarnls/multi-tester": "^2.0",
- "ondrejmirtes/better-reflection": "*",
+ "ondrejmirtes/better-reflection": "<6",
"phpmd/phpmd": "^2.9",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.99 || ^1.7.14",
@@ -3589,10 +3599,6 @@
],
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "3.x-dev",
- "dev-2.x": "2.x-dev"
- },
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
@@ -3602,6 +3608,10 @@
"includes": [
"extension.neon"
]
+ },
+ "branch-alias": {
+ "dev-2.x": "2.x-dev",
+ "dev-master": "3.x-dev"
}
},
"autoload": {
@@ -3650,7 +3660,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-03T19:18:41+00:00"
+ "time": "2024-12-27T09:28:11+00:00"
},
{
"name": "nojimage/twitter-text-php",
@@ -3848,16 +3858,16 @@
},
{
"name": "phpoffice/phpspreadsheet",
- "version": "1.29.1",
+ "version": "1.29.8",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
- "reference": "59ee38f7480904cd6487e5cbdea4d80ff2758719"
+ "reference": "089ffdfc04b5fcf25a3503d81a4e589f247e20e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/59ee38f7480904cd6487e5cbdea4d80ff2758719",
- "reference": "59ee38f7480904cd6487e5cbdea4d80ff2758719",
+ "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/089ffdfc04b5fcf25a3503d81a4e589f247e20e3",
+ "reference": "089ffdfc04b5fcf25a3503d81a4e589f247e20e3",
"shasum": ""
},
"require": {
@@ -3885,7 +3895,7 @@
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",
- "dompdf/dompdf": "^1.0 || ^2.0",
+ "dompdf/dompdf": "^1.0 || ^2.0 || ^3.0",
"friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.3",
"mpdf/mpdf": "^8.1.1",
@@ -3947,9 +3957,9 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
- "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.1"
+ "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.8"
},
- "time": "2024-09-03T00:55:32+00:00"
+ "time": "2025-01-12T03:16:27+00:00"
},
{
"name": "phpstan/phpdoc-parser",
@@ -4086,8 +4096,8 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev",
- "1.x": "1.x-dev"
+ "1.x": "1.x-dev",
+ "dev-master": "2.x-dev"
}
},
"autoload": {
@@ -4758,16 +4768,16 @@
},
{
"name": "sabre/vobject",
- "version": "4.5.5",
+ "version": "4.5.6",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/vobject.git",
- "reference": "7148cf57d25aaba0a49f6656d37c35e8175b3087"
+ "reference": "900266bb3bd448a9f7f41f82344ad0aba237cb27"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sabre-io/vobject/zipball/7148cf57d25aaba0a49f6656d37c35e8175b3087",
- "reference": "7148cf57d25aaba0a49f6656d37c35e8175b3087",
+ "url": "https://api.github.com/repos/sabre-io/vobject/zipball/900266bb3bd448a9f7f41f82344ad0aba237cb27",
+ "reference": "900266bb3bd448a9f7f41f82344ad0aba237cb27",
"shasum": ""
},
"require": {
@@ -4777,9 +4787,9 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.17.1",
- "phpstan/phpstan": "^0.12",
+ "phpstan/phpstan": "^0.12 || ^1.11",
"phpunit/php-invoker": "^2.0 || ^3.1",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
},
"suggest": {
"hoa/bench": "If you would like to run the benchmark scripts"
@@ -4858,7 +4868,7 @@
"issues": "https://github.com/sabre-io/vobject/issues",
"source": "https://github.com/fruux/sabre-vobject"
},
- "time": "2024-07-02T08:48:52+00:00"
+ "time": "2024-10-14T11:53:54+00:00"
},
{
"name": "sabre/xml",
@@ -5137,8 +5147,8 @@
"type": "symfony-bridge",
"extra": {
"thanks": {
- "name": "phpunit/phpunit",
- "url": "https://github.com/sebastianbergmann/phpunit"
+ "url": "https://github.com/sebastianbergmann/phpunit",
+ "name": "phpunit/phpunit"
}
},
"autoload": {
@@ -6645,25 +6655,25 @@
},
{
"name": "behat/gherkin",
- "version": "v4.9.0",
+ "version": "v4.10.0",
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
- "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4"
+ "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4",
- "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4",
+ "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6",
+ "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6",
"shasum": ""
},
"require": {
"php": "~7.2|~8.0"
},
"require-dev": {
- "cucumber/cucumber": "dev-gherkin-22.0.0",
+ "cucumber/cucumber": "dev-gherkin-24.1.0",
"phpunit/phpunit": "~8|~9",
- "symfony/yaml": "~3|~4|~5"
+ "symfony/yaml": "~3|~4|~5|~6|~7"
},
"suggest": {
"symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -6702,9 +6712,9 @@
],
"support": {
"issues": "https://github.com/Behat/Gherkin/issues",
- "source": "https://github.com/Behat/Gherkin/tree/v4.9.0"
+ "source": "https://github.com/Behat/Gherkin/tree/v4.10.0"
},
- "time": "2021-10-12T13:05:09+00:00"
+ "time": "2024-10-19T14:46:06+00:00"
},
{
"name": "behat/mink",
@@ -7080,24 +7090,24 @@
},
{
"name": "composer/semver",
- "version": "3.4.2",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
+ "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
- "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+ "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+ "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpstan/phpstan": "^1.4",
- "symfony/phpunit-bridge": "^4.2 || ^5"
+ "phpstan/phpstan": "^1.11",
+ "symfony/phpunit-bridge": "^3 || ^7"
},
"type": "library",
"extra": {
@@ -7141,7 +7151,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.4.2"
+ "source": "https://github.com/composer/semver/tree/3.4.3"
},
"funding": [
{
@@ -7157,7 +7167,7 @@
"type": "tidelift"
}
],
- "time": "2024-07-12T11:35:52+00:00"
+ "time": "2024-09-19T14:15:21+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -7450,6 +7460,123 @@
"abandoned": true,
"time": "2020-10-14T08:39:05+00:00"
},
+ {
+ "name": "phpstan/phpstan",
+ "version": "2.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpstan/phpstan.git",
+ "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+ "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4|^8.0"
+ },
+ "conflict": {
+ "phpstan/phpstan-shim": "*"
+ },
+ "bin": [
+ "phpstan",
+ "phpstan.phar"
+ ],
+ "type": "library",
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "PHPStan - PHP Static Analysis Tool",
+ "keywords": [
+ "dev",
+ "static analysis"
+ ],
+ "support": {
+ "docs": "https://phpstan.org/user-guide/getting-started",
+ "forum": "https://github.com/phpstan/phpstan/discussions",
+ "issues": "https://github.com/phpstan/phpstan/issues",
+ "security": "https://github.com/phpstan/phpstan/security/policy",
+ "source": "https://github.com/phpstan/phpstan-src"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/ondrejmirtes",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/phpstan",
+ "type": "github"
+ }
+ ],
+ "time": "2025-01-05T16:43:48+00:00"
+ },
+ {
+ "name": "rector/rector",
+ "version": "2.0.7",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/rectorphp/rector.git",
+ "reference": "e70d681f6a0c361a63e6825897cd97746436f015"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/rectorphp/rector/zipball/e70d681f6a0c361a63e6825897cd97746436f015",
+ "reference": "e70d681f6a0c361a63e6825897cd97746436f015",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4|^8.0",
+ "phpstan/phpstan": "^2.1.1"
+ },
+ "conflict": {
+ "rector/rector-doctrine": "*",
+ "rector/rector-downgrade-php": "*",
+ "rector/rector-phpunit": "*",
+ "rector/rector-symfony": "*"
+ },
+ "suggest": {
+ "ext-dom": "To manipulate phpunit.xml via the custom-rule command"
+ },
+ "bin": [
+ "bin/rector"
+ ],
+ "type": "library",
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+ "keywords": [
+ "automation",
+ "dev",
+ "migration",
+ "refactoring"
+ ],
+ "support": {
+ "issues": "https://github.com/rectorphp/rector/issues",
+ "source": "https://github.com/rectorphp/rector/tree/2.0.7"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/tomasvotruba",
+ "type": "github"
+ }
+ ],
+ "time": "2025-01-19T09:41:28+00:00"
+ },
{
"name": "smalot/pdfparser",
"version": "v0.19.0",
diff --git a/db/seeds/Session.php b/db/seeds/Session.php
index 4bc61b65e..5a3702766 100644
--- a/db/seeds/Session.php
+++ b/db/seeds/Session.php
@@ -11,8 +11,8 @@ class Session extends AbstractSeed
public function run()
{
- $dateDebut = DateTimeImmutable::createFromFormat('U', strtotime('-' .rand(5, 6). ' days'));
- $date = DateTimeImmutable::createFromFormat('U', strtotime('-' .rand(1, 5). ' days'));
+ $dateDebut = DateTimeImmutable::createFromFormat('U', strtotime('-' .random_int(5, 6). ' days'));
+ $date = DateTimeImmutable::createFromFormat('U', strtotime('-' .random_int(1, 5). ' days'));
$sessions = [
[
diff --git a/htdocs/pages/administration/compta_balance.php b/htdocs/pages/administration/compta_balance.php
index 521850159..70c24fdd6 100644
--- a/htdocs/pages/administration/compta_balance.php
+++ b/htdocs/pages/administration/compta_balance.php
@@ -9,7 +9,7 @@
exit;
}
-$action = verifierAction(array('lister', 'editer','raccourci','view'));
+$action = verifierAction(['lister', 'editer','raccourci','view']);
//$compte = verifierAction(array('espece','paypal','courant','livreta'));
//$tris_valides = array('Date', 'Evenement', 'catégorie', 'Description');
diff --git a/htdocs/pages/administration/compta_banque.php b/htdocs/pages/administration/compta_banque.php
index d717d5e69..7acbf2be4 100644
--- a/htdocs/pages/administration/compta_banque.php
+++ b/htdocs/pages/administration/compta_banque.php
@@ -16,7 +16,7 @@
exit;
}
-$action = verifierAction(array('lister', 'exporter', 'download_attachments'));
+$action = verifierAction(['lister', 'exporter', 'download_attachments']);
$smarty->assign('action', $action);
@@ -115,40 +115,40 @@
for ($i = 1; $i < 13; $i++) {
$sheet = $workbook->getSheet($i);
- $sheet->getStyle('A1')->applyFromArray(array(
- 'font' => array(
+ $sheet->getStyle('A1')->applyFromArray([
+ 'font' => [
'size' => 12,
'bold' => true,
'name' => 'Ubuntu'
- )
- ));
- $sheet->getStyle('A3:K3')->applyFromArray(array(
- 'font' => array(
+ ]
+ ]);
+ $sheet->getStyle('A3:K3')->applyFromArray([
+ 'font' => [
'size' => 10,
'bold' => true,
'name' => 'Ubuntu'
- ),
- 'alignment' => array('horizontal' => Alignment::HORIZONTAL_CENTER),
- 'borders' => array(
- 'allborders' => array(
+ ],
+ 'alignment' => ['horizontal' => Alignment::HORIZONTAL_CENTER],
+ 'borders' => [
+ 'allborders' => [
'style' => Border::BORDER_THIN,
- 'color' => array('rgb' => 'FF666666')
- )
- )
- ));
- $sheet->getStyle('A4:K' . ($compteurLigne[$i] + 1))->applyFromArray(array(
- 'font' => array(
+ 'color' => ['rgb' => 'FF666666']
+ ]
+ ]
+ ]);
+ $sheet->getStyle('A4:K' . ($compteurLigne[$i] + 1))->applyFromArray([
+ 'font' => [
'size' => 10,
'name' => 'Ubuntu'
- ),
- 'borders' => array(
- 'allborders' => array(
+ ],
+ 'borders' => [
+ 'allborders' => [
'style' => Border::BORDER_THIN,
- 'color' => array('rgb' => 'FF666666')
- )
- )
- ));
- $sheet->getStyle('J3:I200')->applyFromArray(array('alignment' => array('horizontal' => Alignment::HORIZONTAL_CENTER)));
+ 'color' => ['rgb' => 'FF666666']
+ ]
+ ]
+ ]);
+ $sheet->getStyle('J3:I200')->applyFromArray(['alignment' => ['horizontal' => Alignment::HORIZONTAL_CENTER]]);
$sheet->setCellValue('E' . $compteurLigne[$i], 'TOTAL');
$sheet->setCellValue('F' . $compteurLigne[$i], $sousTotal[$i]['debit']);
@@ -157,16 +157,16 @@
$sheet->setCellValue('F' . ($compteurLigne[$i] + 1), $sousTotal[$i]['dif']);
$sheet->mergeCells('F' . ($compteurLigne[$i] + 1) . ':G' . ($compteurLigne[$i] + 1));
- $sheet->getStyle('A' . $compteurLigne[$i] . ':J' . ($compteurLigne[$i] + 1))->applyFromArray(array(
- 'font' => array(
+ $sheet->getStyle('A' . $compteurLigne[$i] . ':J' . ($compteurLigne[$i] + 1))->applyFromArray([
+ 'font' => [
'size' => 10,
'bold' => true,
'name' => 'Ubuntu'
- )
- ));
- $sheet->getStyle('F' . ($compteurLigne[$i] + 1))->getAlignment()->applyFromArray(array('horizontal' => Alignment::HORIZONTAL_CENTER));
+ ]
+ ]);
+ $sheet->getStyle('F' . ($compteurLigne[$i] + 1))->getAlignment()->applyFromArray(['horizontal' => Alignment::HORIZONTAL_CENTER]);
- $sheet->getStyle('F4:G200')->applyFromArray(array('numberformat' => array('code' => NumberFormat::FORMAT_NUMBER_00)));
+ $sheet->getStyle('F4:G200')->applyFromArray(['numberformat' => ['code' => NumberFormat::FORMAT_NUMBER_00]]);
$sheet->getColumnDimension('A')->setWidth(8);
$sheet->getColumnDimension('C')->setWidth(36);
diff --git a/htdocs/pages/administration/compta_bilan.php b/htdocs/pages/administration/compta_bilan.php
index 68ee61543..3ebf97294 100644
--- a/htdocs/pages/administration/compta_bilan.php
+++ b/htdocs/pages/administration/compta_bilan.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'editer','view'));
+$action = verifierAction(['lister', 'editer','view']);
$smarty->assign('action', $action);
//$compte=$_GET['compte'];
diff --git a/htdocs/pages/administration/compta_conf_categorie.php b/htdocs/pages/administration/compta_conf_categorie.php
index b8c776f34..2685c7628 100644
--- a/htdocs/pages/administration/compta_conf_categorie.php
+++ b/htdocs/pages/administration/compta_conf_categorie.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier'));
+$action = verifierAction(['lister', 'ajouter', 'modifier']);
$smarty->assign('action', $action);
$compta = new Comptabilite($bdd);
@@ -39,7 +39,7 @@
// partie saisie
$formulaire->addElement('header' , '' , '');
- $formulaire->addElement('text', 'categorie', 'Categorie' , array('size' => 30, 'maxlength' => 40));
+ $formulaire->addElement('text', 'categorie', 'Categorie' , ['size' => 30, 'maxlength' => 40]);
// boutons
diff --git a/htdocs/pages/administration/compta_conf_compte.php b/htdocs/pages/administration/compta_conf_compte.php
index af0cc3d5f..e45ab350f 100644
--- a/htdocs/pages/administration/compta_conf_compte.php
+++ b/htdocs/pages/administration/compta_conf_compte.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier'));
+$action = verifierAction(['lister', 'ajouter', 'modifier']);
$smarty->assign('action', $action);
$compta = new Comptabilite($bdd);
@@ -39,7 +39,7 @@
// partie saisie
$formulaire->addElement('header' , '' , '');
- $formulaire->addElement('text', 'nom_compte', 'Compte' , array('size' => 30, 'maxlength' => 40));
+ $formulaire->addElement('text', 'nom_compte', 'Compte' , ['size' => 30, 'maxlength' => 40]);
// boutons
diff --git a/htdocs/pages/administration/compta_conf_evenement.php b/htdocs/pages/administration/compta_conf_evenement.php
index f79b72e3a..462a6136d 100644
--- a/htdocs/pages/administration/compta_conf_evenement.php
+++ b/htdocs/pages/administration/compta_conf_evenement.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier'));
+$action = verifierAction(['lister', 'ajouter', 'modifier']);
$smarty->assign('action', $action);
$compta = new Comptabilite($bdd);
@@ -37,7 +37,7 @@
// partie saisie
$formulaire->addElement('header' , '' , '');
- $formulaire->addElement('text', 'evenement', 'Nom Evenement' , array('size' => 30, 'maxlength' => 40));
+ $formulaire->addElement('text', 'evenement', 'Nom Evenement' , ['size' => 30, 'maxlength' => 40]);
// boutons
diff --git a/htdocs/pages/administration/compta_conf_operation.php b/htdocs/pages/administration/compta_conf_operation.php
index b2614b7bf..ae9f47ef4 100644
--- a/htdocs/pages/administration/compta_conf_operation.php
+++ b/htdocs/pages/administration/compta_conf_operation.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier'));
+$action = verifierAction(['lister', 'ajouter', 'modifier']);
//$tris_valides = array('Date', 'Evenement', 'catégorie', 'Description');
//$sens_valides = array('asc', 'desc');
$smarty->assign('action', $action);
@@ -40,7 +40,7 @@
// partie saisie
$formulaire->addElement('header' , '' , '');
- $formulaire->addElement('text', 'operation', 'Operation' , array('size' => 30, 'maxlength' => 40));
+ $formulaire->addElement('text', 'operation', 'Operation' , ['size' => 30, 'maxlength' => 40]);
// boutons
diff --git a/htdocs/pages/administration/compta_conf_regle.php b/htdocs/pages/administration/compta_conf_regle.php
index c64fa5c9f..31f6e5236 100644
--- a/htdocs/pages/administration/compta_conf_regle.php
+++ b/htdocs/pages/administration/compta_conf_regle.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier'));
+$action = verifierAction(['lister', 'ajouter', 'modifier']);
$smarty->assign('action', $action);
@@ -31,14 +31,14 @@
// partie saisie
$formulaire->addElement('header', '', '');
- $formulaire->addElement('text', 'label', 'Nom de la règle', array('size' => 30, 'maxlength' => 255));
- $formulaire->addElement('text', 'condition', 'Condition', array('size' => 30, 'maxlength' => 255));
- $formulaire->addElement('select', 'is_credit', 'Crédit/débit ?', array(null => 'Les deux', '1' => 'Crédit', '0' => 'Débit'));
+ $formulaire->addElement('text', 'label', 'Nom de la règle', ['size' => 30, 'maxlength' => 255]);
+ $formulaire->addElement('text', 'condition', 'Condition', ['size' => 30, 'maxlength' => 255]);
+ $formulaire->addElement('select', 'is_credit', 'Crédit/débit ?', [null => 'Les deux', '1' => 'Crédit', '0' => 'Débit']);
$formulaire->addElement('select', 'mode_regl_id', 'Mode de règlement', [null => 'N.C.'] + ComptaModeReglement::list());
- $formulaire->addElement('select', 'vat', 'Taux de TVA', array(null => 'N.C.', '0' => '0%', '5_5' => '5.5%', '10' => '10%', '20' => '20%'));
+ $formulaire->addElement('select', 'vat', 'Taux de TVA', [null => 'N.C.', '0' => '0%', '5_5' => '5.5%', '10' => '10%', '20' => '20%']);
$formulaire->addElement('select', 'category_id', 'Catégorie', $compta->obtenirListCategories());
$formulaire->addElement('select', 'event_id', 'Évènement', $compta->obtenirListEvenements());
- $formulaire->addElement('select', 'attachment_required', 'Justificatif obligatoire ?', array(null => 'N.C.', '1' => 'Oui', '0' => 'Non'));
+ $formulaire->addElement('select', 'attachment_required', 'Justificatif obligatoire ?', [null => 'N.C.', '1' => 'Oui', '0' => 'Non']);
$formulaire->addRule('label' , 'Nom manquant' , 'required');
$formulaire->addRule('condition' , 'Condition manquante' , 'required');
diff --git a/htdocs/pages/administration/compta_conf_reglement.php b/htdocs/pages/administration/compta_conf_reglement.php
index 43b28715f..f86fa563c 100644
--- a/htdocs/pages/administration/compta_conf_reglement.php
+++ b/htdocs/pages/administration/compta_conf_reglement.php
@@ -10,7 +10,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier'));
+$action = verifierAction(['lister', 'ajouter', 'modifier']);
$smarty->assign('action', $action);
$compta = new Comptabilite($bdd);
@@ -36,7 +36,7 @@
// partie saisie
$formulaire->addElement('header' , '' , '');
- $formulaire->addElement('text', 'reglement', 'Nom Reglement' , array('size' => 30, 'maxlength' => 40));
+ $formulaire->addElement('text', 'reglement', 'Nom Reglement' , ['size' => 30, 'maxlength' => 40]);
// boutons
diff --git a/htdocs/pages/administration/compta_devis.php b/htdocs/pages/administration/compta_devis.php
index b4da2d37b..f2c4b6faf 100644
--- a/htdocs/pages/administration/compta_devis.php
+++ b/htdocs/pages/administration/compta_devis.php
@@ -12,14 +12,14 @@
exit;
}
-$action = verifierAction(array(
+$action = verifierAction([
'lister',
'devis',
'ajouter',
'modifier',
'telecharger_devis',
'transfert',
- ));
+ ]);
$smarty->assign('action', $action);
@@ -123,59 +123,59 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
//$mois=10;
if ($action == 'modifier')
{
- $formulaire->addElement('date' , 'date_devis' , 'Date devis', array('language' => 'fr',
+ $formulaire->addElement('date' , 'date_devis' , 'Date devis', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y')-3,
- 'maxYear' => date('Y')));
+ 'maxYear' => date('Y')]);
} else {
- $formulaire->addElement('date' , 'date_devis' , 'Date devis', array('language' => 'fr',
+ $formulaire->addElement('date' , 'date_devis' , 'Date devis', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y'),
- 'maxYear' => date('Y')));
+ 'maxYear' => date('Y')]);
}
$formulaire->addElement('header' , '' , 'Facturation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations concernent la personne ou la société qui sera facturée
');
- $formulaire->addElement('text' , 'societe' , 'Société' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'service' , 'Service' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('textarea', 'adresse' , 'Adresse' , array('cols' => 42, 'rows' => 10));
- $formulaire->addElement('text' , 'code_postal', 'Code postal' , array('size' => 6, 'maxlength' => 10));
- $formulaire->addElement('text' , 'ville' , 'Ville' , array('size' => 30, 'maxlength' => 50));
+ $formulaire->addElement('text' , 'societe' , 'Société' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'service' , 'Service' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('textarea', 'adresse' , 'Adresse' , ['cols' => 42, 'rows' => 10]);
+ $formulaire->addElement('text' , 'code_postal', 'Code postal' , ['size' => 6, 'maxlength' => 10]);
+ $formulaire->addElement('text' , 'ville' , 'Ville' , ['size' => 30, 'maxlength' => 50]);
$formulaire->addElement('select' , 'id_pays' , 'Pays' , $pays->obtenirPays());
$formulaire->addElement('header', null , 'Contact');
- $formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'prenom' , 'Prénom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'tel' , 'tel' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'email' , 'Email (facture)', array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', array('size' => 30, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'prenom' , 'Prénom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'tel' , 'tel' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'email' , 'Email (facture)', ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', ['size' => 30, 'maxlength' => 100]);
if (isset($champs['numero_devis']) || isset($champs['numero_facture']) )
{
$formulaire->addElement('header', null , 'Réservé à l\'administration');
$formulaire->addElement('static' , 'note' , '' , 'Numéro généré automatiquement et affiché en automatique');
if ($champs['numero_devis'])
- $formulaire->addElement('text' , 'numero_devis' , 'Numéro devis' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'numero_devis' , 'Numéro devis' , ['size' => 50, 'maxlength' => 100]);
if ($champs['numero_facture'])
- $formulaire->addElement('text' , 'numero_facture' , 'Numéro facture' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'numero_facture' , 'Numéro facture' , ['size' => 50, 'maxlength' => 100]);
} else {
- $formulaire->addElement('hidden' , 'numero_devis' , 'Numéro devis' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('hidden' , 'numero_facture' , 'Numéro facture' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('hidden' , 'numero_devis' , 'Numéro devis' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('hidden' , 'numero_facture' , 'Numéro facture' , ['size' => 50, 'maxlength' => 100]);
}
$formulaire->addElement('header', null , 'Référence client');
$formulaire->addElement('static' , 'note' , '', 'Possible d\'avoir plusieurs références à mettre (obligation client)
');
- $formulaire->addElement('text' , 'ref_clt1' , 'Référence client' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'ref_clt2' , 'Référence client 2', array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'ref_clt3' , 'Référence client 3' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'ref_clt1' , 'Référence client' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'ref_clt2' , 'Référence client 2', ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'ref_clt3' , 'Référence client 3' , ['size' => 50, 'maxlength' => 100]);
$formulaire->addElement('header' , '', 'Observation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations seront écrites à la fin du document
');
- $formulaire->addElement('textarea', 'observation' , 'Observation', array('cols' => 42, 'rows' => 5));
+ $formulaire->addElement('textarea', 'observation' , 'Observation', ['cols' => 42, 'rows' => 5]);
$formulaire->addElement('header' , '', 'Devise');
- $formulaire->addElement('select', 'devise_facture' , 'Monnaie de la facture', array('EUR' => 'Euro',
- 'DOL' => 'Dollar'), array('size' => 2));
+ $formulaire->addElement('select', 'devise_facture' , 'Monnaie de la facture', ['EUR' => 'Euro',
+ 'DOL' => 'Dollar'], ['size' => 2]);
for ($i=1;$i<6;$i++)
@@ -183,12 +183,12 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
$formulaire->addElement('header' , '', 'Contenu');
$formulaire->addElement('static' , 'note' , '' , 'Ligne '.$i.'
');
$formulaire->addElement('hidden' , 'id'.$i , 'id' );
- $formulaire->addElement('text' , 'ref'.$i , 'Référence' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'ref'.$i , 'Référence' , ['size' => 50, 'maxlength' => 100]);
$formulaire->addElement('static' , 'note' , '' , 'Rappel : sponsoring 20%, place supplémentaire 10%.
');
- $formulaire->addElement('select' , 'tva' . $i , 'Taux de TVA' , array('0' => 'Non soumis', '5.50' => '5.5%', '10.00' => '10%', '20.00' => '20%'));
- $formulaire->addElement('textarea', 'designation'.$i , 'Désignation', array('cols' => 42, 'rows' => 5));
- $formulaire->addElement('text' , 'quantite'.$i , 'Quantite' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire HT' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('select' , 'tva' . $i , 'Taux de TVA' , ['0' => 'Non soumis', '5.50' => '5.5%', '10.00' => '10%', '20.00' => '20%']);
+ $formulaire->addElement('textarea', 'designation'.$i , 'Désignation', ['cols' => 42, 'rows' => 5]);
+ $formulaire->addElement('text' , 'quantite'.$i , 'Quantite' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire HT' , ['size' => 50, 'maxlength' => 100]);
}
diff --git a/htdocs/pages/administration/compta_facture.php b/htdocs/pages/administration/compta_facture.php
index 3a28f9ab6..ca357237d 100644
--- a/htdocs/pages/administration/compta_facture.php
+++ b/htdocs/pages/administration/compta_facture.php
@@ -12,12 +12,12 @@
exit;
}
-$action = verifierAction(array(
+$action = verifierAction([
'lister',
'modifier',
'telecharger_facture',
'envoyer_facture'
- ));
+ ]);
//$action = verifierAction(array('lister', 'devis','facture','ajouter', 'modifier'));
@@ -113,71 +113,71 @@
//$mois=10;
if ($action == 'modifier')
{
- $formulaire->addElement('date' , 'date_facture' , 'Date facture', array('language' => 'fr',
+ $formulaire->addElement('date' , 'date_facture' , 'Date facture', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y')-3,
- 'maxYear' => date('Y')));
+ 'maxYear' => date('Y')]);
} else {
- $formulaire->addElement('date' , 'date_facture' , 'Date facture', array('language' => 'fr',
+ $formulaire->addElement('date' , 'date_facture' , 'Date facture', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y'),
- 'maxYear' => date('Y')));
+ 'maxYear' => date('Y')]);
}
$formulaire->addElement('header' , '' , 'Facturation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations concernent la personne ou la société qui sera facturée
');
- $formulaire->addElement('text' , 'societe' , 'Société' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'service' , 'Service' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('textarea', 'adresse' , 'Adresse' , array('cols' => 42, 'rows' => 10));
- $formulaire->addElement('text' , 'code_postal', 'Code postal' , array('size' => 6, 'maxlength' => 10));
- $formulaire->addElement('text' , 'ville' , 'Ville' , array('size' => 30, 'maxlength' => 50));
+ $formulaire->addElement('text' , 'societe' , 'Société' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'service' , 'Service' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('textarea', 'adresse' , 'Adresse' , ['cols' => 42, 'rows' => 10]);
+ $formulaire->addElement('text' , 'code_postal', 'Code postal' , ['size' => 6, 'maxlength' => 10]);
+ $formulaire->addElement('text' , 'ville' , 'Ville' , ['size' => 30, 'maxlength' => 50]);
$formulaire->addElement('select' , 'id_pays' , 'Pays' , $pays->obtenirPays());
$formulaire->addElement('header', null , 'Contact');
- $formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'prenom' , 'Prénom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'tel' , 'Numero de tél' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'email' , 'Email (facture)', array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', array('size' => 30, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'prenom' , 'Prénom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'tel' , 'Numero de tél' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'email' , 'Email (facture)', ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', ['size' => 30, 'maxlength' => 100]);
if ($champs['numero_devis'] || $champs['numero_facture'] )
{
$formulaire->addElement('header', null , 'Réservé à l\'administration');
$formulaire->addElement('static' , 'note' , '' , 'Numéro généré automatiquement et affiché en automatique');
if ($champs['numero_devis'])
- $formulaire->addElement('text' , 'numero_devis' , 'Numéro devis' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'numero_devis' , 'Numéro devis' , ['size' => 50, 'maxlength' => 100]);
if ($champs['numero_facture'])
- $formulaire->addElement('text' , 'numero_facture' , 'Numéro facture' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'numero_facture' , 'Numéro facture' , ['size' => 50, 'maxlength' => 100]);
} else {
- $formulaire->addElement('hidden' , 'numero_devis' , 'Numéro devis' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('hidden' , 'numero_facture' , 'Numéro facture' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('hidden' , 'numero_devis' , 'Numéro devis' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('hidden' , 'numero_facture' , 'Numéro facture' , ['size' => 50, 'maxlength' => 100]);
}
$formulaire->addElement('header', null , 'Référence client');
$formulaire->addElement('static' , 'note' , '', 'Possible d\'avoir plusieurs références à mettre (obligation client)
');
- $formulaire->addElement('text' , 'ref_clt1' , 'Référence client' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'ref_clt2' , 'Référence client 2', array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'ref_clt3' , 'Référence client 3' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'ref_clt1' , 'Référence client' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'ref_clt2' , 'Référence client 2', ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'ref_clt3' , 'Référence client 3' , ['size' => 50, 'maxlength' => 100]);
$formulaire->addElement('header' , '', 'Observation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations seront écrites à la fin du document
');
- $formulaire->addElement('textarea', 'observation' , 'Observation', array('cols' => 42, 'rows' => 5));
+ $formulaire->addElement('textarea', 'observation' , 'Observation', ['cols' => 42, 'rows' => 5]);
$formulaire->addElement('header' , '', 'Paiement');
- $formulaire->addElement('select', 'devise_facture' , 'Monnaie de la facture', array('EUR' => 'Euro',
- 'DOL' => 'Dollar'), array('size' => 2));
- $formulaire->addElement('select', 'etat_paiement' , 'Etat paiement', array('En attente de paiement', 'Payé', 'Annulé'), array('size' => 3));
- $formulaire->addElement('date' , 'date_paiement' , 'Date paiement', array('language' => 'fr', 'format' => 'd F Y', 'minYear' => date('Y') - 5, 'maxYear' => date('Y')));
+ $formulaire->addElement('select', 'devise_facture' , 'Monnaie de la facture', ['EUR' => 'Euro',
+ 'DOL' => 'Dollar'], ['size' => 2]);
+ $formulaire->addElement('select', 'etat_paiement' , 'Etat paiement', ['En attente de paiement', 'Payé', 'Annulé'], ['size' => 3]);
+ $formulaire->addElement('date' , 'date_paiement' , 'Date paiement', ['language' => 'fr', 'format' => 'd F Y', 'minYear' => date('Y') - 5, 'maxYear' => date('Y')]);
$formulaire->addElement('header' , '', 'Contenu');
- $formulaire->addElement('text' , 'ref' , 'Référence' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('textarea', 'designation' , 'Désignation', array('cols' => 42, 'rows' => 5));
- $formulaire->addElement('text' , 'quantite' , 'Quantite' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'pu' , 'Prix Unitaire' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'ref' , 'Référence' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('textarea', 'designation' , 'Désignation', ['cols' => 42, 'rows' => 5]);
+ $formulaire->addElement('text' , 'quantite' , 'Quantite' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'pu' , 'Prix Unitaire' , ['size' => 50, 'maxlength' => 100]);
@@ -186,12 +186,12 @@
$formulaire->addElement('header' , '', 'Contenu');
$formulaire->addElement('static' , 'note' , '' , 'Ligne '.$i.'
');
$formulaire->addElement('hidden' , 'id'.$i , 'id' );
- $formulaire->addElement('text' , 'ref'.$i , 'Référence' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'ref'.$i , 'Référence' , ['size' => 50, 'maxlength' => 100]);
$formulaire->addElement('static' , 'note' , '' , 'Rappel : sponsoring 20%, place supplémentaire 10%.
');
- $formulaire->addElement('select' , 'tva' . $i , 'Taux de TVA' , array('0' => 'Non soumis', '5.50' => '5.5%', '10.00' => '10%', '20.00' => '20%'));
- $formulaire->addElement('textarea', 'designation'.$i , 'Désignation', array('cols' => 42, 'rows' => 5));
- $formulaire->addElement('text' , 'quantite'.$i , 'Quantite' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire HT' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('select' , 'tva' . $i , 'Taux de TVA' , ['0' => 'Non soumis', '5.50' => '5.5%', '10.00' => '10%', '20.00' => '20%']);
+ $formulaire->addElement('textarea', 'designation'.$i , 'Désignation', ['cols' => 42, 'rows' => 5]);
+ $formulaire->addElement('text' , 'quantite'.$i , 'Quantite' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire HT' , ['size' => 50, 'maxlength' => 100]);
}
diff --git a/htdocs/pages/administration/compta_journal.php b/htdocs/pages/administration/compta_journal.php
index 4dc96c055..d853f11e2 100755
--- a/htdocs/pages/administration/compta_journal.php
+++ b/htdocs/pages/administration/compta_journal.php
@@ -121,27 +121,27 @@
$formulaire->addElement('header' , '' , 'Détail Facture');
//$mois=10;
- $formulaire->addElement('date' , 'date_saisie' , 'Date saisie', array('language' => 'fr',
+ $formulaire->addElement('date' , 'date_saisie' , 'Date saisie', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y')-5,
- 'maxYear' => date('Y')+1));
+ 'maxYear' => date('Y')+1]);
$formulaire->addElement('select' , 'idcategorie', 'Type de compte', $compta->obtenirListCategories());
- $formulaire->addElement('text', 'nom_frs', 'Nom fournisseurs' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('text', 'numero', 'Numero facture' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('textarea', 'description', 'Description', array('cols' => 42, 'rows' => 5));
- $formulaire->addElement('text', 'montant', 'Montant' , array('size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_montant'));
- $formulaire->addElement('text', 'comment', 'Commentaire' , array('size' => 30, 'maxlength' => 255));
+ $formulaire->addElement('text', 'nom_frs', 'Nom fournisseurs' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('text', 'numero', 'Numero facture' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('textarea', 'description', 'Description', ['cols' => 42, 'rows' => 5]);
+ $formulaire->addElement('text', 'montant', 'Montant' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_montant']);
+ $formulaire->addElement('text', 'comment', 'Commentaire' , ['size' => 30, 'maxlength' => 255]);
$formulaire->addElement('header' , '' , 'TVA');
- $formulaire->addElement('text', 'montant_ht_soumis_tva_5_5', 'Montant HT soumis à TVA 5.5%' , array('size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_5_5'));
+ $formulaire->addElement('text', 'montant_ht_soumis_tva_5_5', 'Montant HT soumis à TVA 5.5%' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_5_5']);
$formulaire->addElement('static' , 'note', '', 'Calculer le montant HT soumis à TVA 5.5% sur la base de l\'intégralité du montant TTC
');
- $formulaire->addElement('text', 'montant_ht_soumis_tva_10', 'Montant HT soumis à TVA 10%' , array('size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_10'));
+ $formulaire->addElement('text', 'montant_ht_soumis_tva_10', 'Montant HT soumis à TVA 10%' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_10']);
$formulaire->addElement('static' , 'note', '', 'Calculer le montant HT soumis à TVA 10% sur la base de l\'intégralité du montant TTC
');
- $formulaire->addElement('text', 'montant_ht_soumis_tva_20', 'Montant HT soumis à TVA 20%' , array('size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_20'));
+ $formulaire->addElement('text', 'montant_ht_soumis_tva_20', 'Montant HT soumis à TVA 20%' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_20']);
$formulaire->addElement('static' , 'note', '', 'Calculer le montant HT soumis à TVA 20% sur la base de l\'intégralité du montant TTC
');
- $formulaire->addElement('text', 'montant_ht_soumis_tva_0', 'Montant HT non soumis à TVA' , array('size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_0'));
+ $formulaire->addElement('text', 'montant_ht_soumis_tva_0', 'Montant HT non soumis à TVA' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_0']);
$formulaire->addElement('static' , 'note', '', 'Calculer le montant non soumis à TVA sur la base de l\'intégralité du montant TTC
');
$formulaire->addElement('select' , 'tva_zone', 'Zone TVA', array_merge(['' => 'Non définie'], Comptabilite::TVA_ZONES));
@@ -149,11 +149,11 @@
//reglement
$formulaire->addElement('header' , '' , 'Réglement');
$formulaire->addElement('select' , 'idmode_regl', 'Réglement', $compta->obtenirListReglements());
- $formulaire->addElement('date' , 'date_reglement' , 'Date', array('language' => 'fr',
+ $formulaire->addElement('date' , 'date_reglement' , 'Date', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => date('Y')-5,
- 'maxYear' => date('Y')+1));
- $formulaire->addElement('text', 'obs_regl', 'Info reglement' , array('size' => 30, 'maxlength' => 40));
+ 'maxYear' => date('Y')+1]);
+ $formulaire->addElement('text', 'obs_regl', 'Info reglement' , ['size' => 30, 'maxlength' => 40]);
// boutons
@@ -512,11 +512,11 @@
$finfo = new finfo(FILEINFO_MIME_TYPE);
if (false === $ext = array_search(
$finfo->file($_FILES['file']['tmp_name']),
- array(
+ [
'jpg' => 'image/jpeg',
'png' => 'image/png',
'pdf' => 'application/pdf',
- ),
+ ],
true
)) {
throw new RuntimeException('Invalid file format. Only jpg/png/pdf allowed.');
@@ -616,7 +616,7 @@
if ($formulaire->validate()) {
$valeurs = $formulaire->exportValues();
$file =& $formulaire->getElement('fichiercsv');
- $tmpDir = dirname(__FILE__) . '/../../../tmp';
+ $tmpDir = __DIR__ . '/../../../tmp';
if ($file->isUploadedFile()) {
$file->moveUploadedFile($tmpDir, 'banque.csv');
$importerFactory = new Importer\Factory();
diff --git a/htdocs/pages/administration/compta_recherche.php b/htdocs/pages/administration/compta_recherche.php
index d74ceb933..0f5d8fe63 100755
--- a/htdocs/pages/administration/compta_recherche.php
+++ b/htdocs/pages/administration/compta_recherche.php
@@ -37,7 +37,7 @@
// No search param?
if (!isset($_GET['q']) || !($q = trim($_GET['q']))) {
$smarty->assign('action', $defaultAction);
- continue;
+ break;
}
$smarty->assign('q', htmlspecialchars($q));
diff --git a/htdocs/pages/administration/compta_synthese.php b/htdocs/pages/administration/compta_synthese.php
index 5f2b714f8..1414b733e 100644
--- a/htdocs/pages/administration/compta_synthese.php
+++ b/htdocs/pages/administration/compta_synthese.php
@@ -9,7 +9,7 @@
exit;
}
-$action = verifierAction(array('lister', 'editer'));
+$action = verifierAction(['lister', 'editer']);
$smarty->assign('action', $action);
$compta = new Comptabilite($bdd);
diff --git a/htdocs/pages/administration/cotisations.php b/htdocs/pages/administration/cotisations.php
index 3e64abfdb..77862502f 100644
--- a/htdocs/pages/administration/cotisations.php
+++ b/htdocs/pages/administration/cotisations.php
@@ -15,7 +15,7 @@
$userRepository = $this->get(UserRepository::class);
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer', 'telecharger_facture', 'envoyer_facture'));
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer', 'telecharger_facture', 'envoyer_facture']);
$smarty->assign('action', $action);
// Personne
@@ -61,8 +61,8 @@
if ($action == 'ajouter') {
$date_debut = $cotisations->obtenirDateDebut($_GET['type_personne'], $_GET['id_personne']);
- $formulaire->setDefaults(array('date_debut' => $date_debut,
- 'date_fin' => strtotime('+1year', $date_debut)));
+ $formulaire->setDefaults(['date_debut' => $date_debut,
+ 'date_fin' => strtotime('+1year', $date_debut)]);
} elseif ($action == 'modifier') {
$formulaire->setDefaults($cotisations->obtenir($_GET['id']));
}
@@ -71,24 +71,24 @@
$formulaire->addElement('hidden', 'id_personne' , $_GET['id_personne']);
$formulaire->addElement('header' , '' , '');
- $formulaire->addElement('text' , 'montant' , 'Montant', array('size' => 5, 'maxlength' => 5));
- $formulaire->addElement('select' , 'type_reglement' , 'Type règlement', array(null => '',
+ $formulaire->addElement('text' , 'montant' , 'Montant', ['size' => 5, 'maxlength' => 5]);
+ $formulaire->addElement('select' , 'type_reglement' , 'Type règlement', [null => '',
AFUP_COTISATIONS_REGLEMENT_ESPECES => 'Espèces',
AFUP_COTISATIONS_REGLEMENT_CHEQUE => 'Chèques',
AFUP_COTISATIONS_REGLEMENT_VIREMENT => 'Virement',
AFUP_COTISATIONS_REGLEMENT_ENLIGNE => 'En ligne',
- AFUP_COTISATIONS_REGLEMENT_AUTRE => 'Autre'));
- $formulaire->addElement('text' , 'informations_reglement', 'Informations', array('size' => 50, 'maxlength' => 255));
- $formulaire->addElement('text', 'reference_client', 'Référence client', array('size' => 50, 'maxlength' => 255));
- $formulaire->addElement('date' , 'date_debut' , 'Date début', array('language' => 'fr',
+ AFUP_COTISATIONS_REGLEMENT_AUTRE => 'Autre']);
+ $formulaire->addElement('text' , 'informations_reglement', 'Informations', ['size' => 50, 'maxlength' => 255]);
+ $formulaire->addElement('text', 'reference_client', 'Référence client', ['size' => 50, 'maxlength' => 255]);
+ $formulaire->addElement('date' , 'date_debut' , 'Date début', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => 2002,
- 'maxYear' => date('Y') + 5));
- $formulaire->addElement('date' , 'date_fin' , 'Date fin', array('language' => 'fr',
+ 'maxYear' => date('Y') + 5]);
+ $formulaire->addElement('date' , 'date_fin' , 'Date fin', ['language' => 'fr',
'format' => 'd F Y',
'minYear' => 2002,
- 'maxYear' => date('Y') + 5));
- $formulaire->addElement('textarea', 'commentaires' , 'Commentaires', array('cols' => 42, 'rows' => 5));
+ 'maxYear' => date('Y') + 5]);
+ $formulaire->addElement('textarea', 'commentaires' , 'Commentaires', ['cols' => 42, 'rows' => 5]);
$formulaire->addElement('header', 'boutons' , '');
$formulaire->addElement('submit', 'soumettre' , ucfirst($action));
diff --git a/htdocs/pages/administration/forum_facturation.php b/htdocs/pages/administration/forum_facturation.php
index eb1e69d52..256b68120 100644
--- a/htdocs/pages/administration/forum_facturation.php
+++ b/htdocs/pages/administration/forum_facturation.php
@@ -17,9 +17,9 @@
/** @var InvoiceService $invoiceService */
$invoiceService = $this->get(InvoiceService::class);
-$action = verifierAction(array('lister', 'telecharger_devis', 'telecharger_facture', 'envoyer_facture', 'facturer_facture', 'supprimer_facture', 'changer_date_reglement'));
-$tris_valides = array('date_facture', 'email', 'societe', 'etat');
-$sens_valides = array('asc' , 'desc');
+$action = verifierAction(['lister', 'telecharger_devis', 'telecharger_facture', 'envoyer_facture', 'facturer_facture', 'supprimer_facture', 'changer_date_reglement']);
+$tris_valides = ['date_facture', 'email', 'societe', 'etat'];
+$sens_valides = ['asc' , 'desc'];
$smarty->assign('action', $action);
diff --git a/htdocs/pages/administration/forum_inscriptions.php b/htdocs/pages/administration/forum_inscriptions.php
index 7598b8d25..efa679737 100644
--- a/htdocs/pages/administration/forum_inscriptions.php
+++ b/htdocs/pages/administration/forum_inscriptions.php
@@ -24,9 +24,9 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer','envoyer_convocation', 'generer_mail_inscription_afup', 'generer_inscription_afup'));
-$tris_valides = array('i.date', 'i.nom', 'f.societe', 'i.etat');
-$sens_valides = array( 'desc','asc' );
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer','envoyer_convocation', 'generer_mail_inscription_afup', 'generer_inscription_afup']);
+$tris_valides = ['i.date', 'i.nom', 'f.societe', 'i.etat'];
+$sens_valides = [ 'desc','asc' ];
$smarty->assign('action', $action);
$eventRepository = $this->get(EventRepository::class);
@@ -225,7 +225,7 @@ function updateGlobalsForTarif(
$formulaire->addElement('hidden', 'id_forum', $_GET['id_forum']);
$formulaire->addElement('header', null, 'Informations');
- $groupe = array();
+ $groupe = [];
foreach ($AFUP_Tarifs_Forum as $tarif_key => $tarifs)
{
$groupe[] = $formulaire->createElement('radio', 'type_inscription', null, $AFUP_Tarifs_Forum_Lib[$tarif_key] . ' (' . $AFUP_Tarifs_Forum[$tarif_key] . ' €)' , $tarif_key);
@@ -234,27 +234,27 @@ function updateGlobalsForTarif(
$formulaire->addGroup($groupe, 'groupe_type_inscription', 'Formule', '
', false);
- $formulaire->addElement('select', 'civilite' , 'Civilité' , array('M.' => 'M.', 'Mme' => 'Mme'));
- $formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'prenom' , 'Prénom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'email' , 'Email' , array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('text' , 'telephone' , 'Tél.' , array('size' => 20, 'maxlength' => 20));
+ $formulaire->addElement('select', 'civilite' , 'Civilité' , ['M.' => 'M.', 'Mme' => 'Mme']);
+ $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'prenom' , 'Prénom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'email' , 'Email' , ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'telephone' , 'Tél.' , ['size' => 20, 'maxlength' => 20]);
- $groupe = array();
+ $groupe = [];
$formulaire->addElement('header', null , 'Réservé à l\'administration');
$formulaire->addElement('static' , 'note' , '' , 'La reference est utilisée comme numéro de facture. Elle peut être commune à plusieurs inscriptions...
');
if ($action != 'ajouter') {
- $formulaire->addElement('static', 'html', '', 'Rechercher la facture');
+ $formulaire->addElement('static', 'html', '', 'Rechercher la facture');
}
- $formulaire->addElement('text' , 'reference' , 'Référence' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'autorisation', 'Autorisation', array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'transaction' , 'Transaction' , array('size' => 50, 'maxlength' => 100));
+ $formulaire->addElement('text' , 'reference' , 'Référence' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'autorisation', 'Autorisation', ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'transaction' , 'Transaction' , ['size' => 50, 'maxlength' => 100]);
- $state = array(AFUP_FORUM_ETAT_CREE => 'Inscription créée',
+ $state = [AFUP_FORUM_ETAT_CREE => 'Inscription créée',
AFUP_FORUM_ETAT_ANNULE => 'Inscription annulée',
AFUP_FORUM_ETAT_ERREUR => 'Paiement CB erreur',
AFUP_FORUM_ETAT_REFUSE => 'Paiement CB refusé',
@@ -263,60 +263,60 @@ function updateGlobalsForTarif(
AFUP_FORUM_ETAT_ATTENTE_REGLEMENT => 'Attente règlement',
AFUP_FORUM_ETAT_CONFIRME => 'Inscription confirmée',
AFUP_FORUM_ETAT_A_POSTERIORI => 'Inscription à posteriori',
- );
+ ];
$formulaire->addElement('select', 'etat' , 'Etat' , $state);
- $facturation = array(AFUP_FORUM_FACTURE_A_ENVOYER => 'Facture à envoyer',
+ $facturation = [AFUP_FORUM_FACTURE_A_ENVOYER => 'Facture à envoyer',
AFUP_FORUM_FACTURE_ENVOYEE => 'Facture envoyée',
AFUP_FORUM_FACTURE_RECUE => 'Facture reçue',
- );
+ ];
$formulaire->addElement('select', 'facturation' , 'Facturation' , $facturation);
$formulaire->addElement('header' , '' , 'Règlement');
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'type_reglement', null, 'Carte bancaire', AFUP_FORUM_REGLEMENT_CARTE_BANCAIRE);
$groupe[] = $formulaire->createElement('radio', 'type_reglement', null, 'Chèque' , AFUP_FORUM_REGLEMENT_CHEQUE);
$groupe[] = $formulaire->createElement('radio', 'type_reglement', null, 'Virement' , AFUP_FORUM_REGLEMENT_VIREMENT);
$groupe[] = $formulaire->createElement('radio', 'type_reglement', null, 'Aucun' , AFUP_FORUM_REGLEMENT_AUCUN);
$formulaire->addGroup($groupe, 'groupe_type_reglement', 'Règlement', ' ', false);
- $formulaire->addElement('textarea' , 'informations_reglement', 'Informations règlement', array('cols' => 42, 'rows' => 4));
+ $formulaire->addElement('textarea' , 'informations_reglement', 'Informations règlement', ['cols' => 42, 'rows' => 4]);
$current = $forum->obtenir($_GET['id_forum']);
- $formulaire->addElement('date' , 'date_reglement' , 'Date', array('language' => 'fr', 'minYear' => $current['forum_annee']-2, 'maxYear' => $current['forum_annee']+2));
+ $formulaire->addElement('date' , 'date_reglement' , 'Date', ['language' => 'fr', 'minYear' => $current['forum_annee']-2, 'maxYear' => $current['forum_annee']+2]);
$formulaire->addElement('header' , '' , 'Facturation');
$formulaire->addElement('static' , 'note' , '' , 'Ces informations concernent la personne ou la société qui sera facturée
');
- $formulaire->addElement('text' , 'societe_facturation' , 'Société' , array('size' => 50, 'maxlength' => 100));
- $formulaire->addElement('text' , 'nom_facturation' , 'Nom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'prenom_facturation' , 'Prénom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('textarea', 'adresse_facturation' , 'Adresse' , array('cols' => 42, 'rows' => 10));
- $formulaire->addElement('text' , 'code_postal_facturation', 'Code postal' , array('size' => 6, 'maxlength' => 10));
- $formulaire->addElement('text' , 'ville_facturation' , 'Ville' , array('size' => 30, 'maxlength' => 50));
+ $formulaire->addElement('text' , 'societe_facturation' , 'Société' , ['size' => 50, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'nom_facturation' , 'Nom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'prenom_facturation' , 'Prénom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('textarea', 'adresse_facturation' , 'Adresse' , ['cols' => 42, 'rows' => 10]);
+ $formulaire->addElement('text' , 'code_postal_facturation', 'Code postal' , ['size' => 6, 'maxlength' => 10]);
+ $formulaire->addElement('text' , 'ville_facturation' , 'Ville' , ['size' => 30, 'maxlength' => 50]);
$formulaire->addElement('select' , 'id_pays_facturation' , 'Pays' , $pays->obtenirPays());
- $formulaire->addElement('text' , 'email_facturation' , 'Email (facture)', array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('text' , 'coupon' , 'Coupon' , array('size' => 30, 'maxlength' => 200));
+ $formulaire->addElement('text' , 'email_facturation' , 'Email (facture)', ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'coupon' , 'Coupon' , ['size' => 30, 'maxlength' => 200]);
$formulaire->addElement('header', null, 'Divers');
- $formulaire->addElement('textarea', 'commentaires' , 'Commentaires', array('cols' => 42, 'rows' => 5));
+ $formulaire->addElement('textarea', 'commentaires' , 'Commentaires', ['cols' => 42, 'rows' => 5]);
$formulaire->addElement('static', 'label', null, "J'accepte que ma compagnie soit citée comme participant à la conférence");
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'citer_societe', null, 'oui', 1);
$groupe[] = $formulaire->createElement('radio', 'citer_societe', null, 'non', 0);
$formulaire->addGroup($groupe, 'groupe_citer_societe', null, ' ', false);
$formulaire->addElement('static', 'label', null, "Je souhaite être tenu au courant des rencontres de l'AFUP sur des sujets afférents à PHP");
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'newsletter_afup', null, 'oui', 1);
$groupe[] = $formulaire->createElement('radio', 'newsletter_afup', null, 'non', 0);
$formulaire->addGroup($groupe, 'groupe_newsletter_afup', null, ' ', false);
$formulaire->addElement('static', 'label', null, "Je souhaite être tenu au courant de l'actualité PHP via la newsletter de notre sponsor");
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'newsletter_nexen', null, 'oui', 1);
$groupe[] = $formulaire->createElement('radio', 'newsletter_nexen', null, 'non', 0);
$formulaire->addGroup($groupe, 'groupe_newsletter_nexen', null, ' ', false);
$formulaire->addElement('static', 'label', null, "Je souhaite recevoir des informations de la part de vos partenaires presse/media");
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'mail_partenaire', null, 'oui', 1);
$groupe[] = $formulaire->createElement('radio', 'mail_partenaire', null, 'non', 0);
$formulaire->addGroup($groupe, 'groupe_mail_partenaire', null, ' ', false);
diff --git a/htdocs/pages/administration/forum_joind_in.php b/htdocs/pages/administration/forum_joind_in.php
index 6477b7639..0cb02a597 100644
--- a/htdocs/pages/administration/forum_joind_in.php
+++ b/htdocs/pages/administration/forum_joind_in.php
@@ -9,9 +9,9 @@
exit;
}
-$action = verifierAction(array('telecharger_joindin'));
-$tris_valides = array();
-$sens_valides = array('asc' , 'desc');
+$action = verifierAction(['telecharger_joindin']);
+$tris_valides = [];
+$sens_valides = ['asc' , 'desc'];
$smarty->assign('action', $action);
diff --git a/htdocs/pages/administration/forum_partenaire.php b/htdocs/pages/administration/forum_partenaire.php
index 53cedae84..d18bce304 100644
--- a/htdocs/pages/administration/forum_partenaire.php
+++ b/htdocs/pages/administration/forum_partenaire.php
@@ -12,7 +12,7 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer'));
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer']);
$smarty->assign('action', $action);
@@ -36,7 +36,7 @@
} else {
$formulaire = instancierFormulaire();
if ($action == 'ajouter') {
- $formulaire->setDefaults(array('ranking' => 1));
+ $formulaire->setDefaults(['ranking' => 1]);
} else {
$champs = $partenaires->obtenir($_GET['id']);
$forum = $forums->obtenir($champs['id_forum']);
@@ -53,10 +53,10 @@
$formulaire->addElement('header' , '' , 'Partenaire de forum');
$formulaire->addElement('select' , 'id_forum' , 'Forum' , $forums->obtenirListe(null,'id, titre', 'titre', true));
$formulaire->addElement('select' , 'id_niveau_partenariat' , 'Partenariat' , $niveauPartenariat->obtenirListe());
- $formulaire->addElement('text' , 'ranking' , 'Rang' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('textarea', 'presentation', 'Présentation' , array('cols' => 42, 'rows' => 15, 'class' => 'tinymce'));
- $formulaire->addElement('text' , 'site' , 'Site' , array('size' => 30));
+ $formulaire->addElement('text' , 'ranking' , 'Rang' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('textarea', 'presentation', 'Présentation' , ['cols' => 42, 'rows' => 15, 'class' => 'tinymce']);
+ $formulaire->addElement('text' , 'site' , 'Site' , ['size' => 30]);
$formulaire->addElement('static' , 'note' , '', 'Faire attention à la taille');
$formulaire->addElement('file' , 'logo' , 'Logo');
if ($action == 'modifier') {
diff --git a/htdocs/pages/administration/forum_planning.php b/htdocs/pages/administration/forum_planning.php
index ce5842a65..a6ea267a2 100755
--- a/htdocs/pages/administration/forum_planning.php
+++ b/htdocs/pages/administration/forum_planning.php
@@ -12,9 +12,9 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'commenter', 'supprimer', 'voter'));
-$tris_valides = array();
-$sens_valides = array('asc' , 'desc');
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'commenter', 'supprimer', 'voter']);
+$tris_valides = [];
+$sens_valides = ['asc' , 'desc'];
$smarty->assign('action', $action);
@@ -71,7 +71,7 @@
}
$formulaire->setDefaults($champs);
- $id = isset($_GET['id']) ? $_GET['id'] : 0;
+ $id = $_GET['id'] ?? 0;
$formulaire->addElement('hidden', 'id' , null);
$formulaire->addElement('hidden', 'id_session', $_GET['id_session']);
@@ -86,10 +86,10 @@
}
$formulaire->addElement('header', null, 'Plannification');
- $formulaire->addElement('date' , 'debut' , 'Début', array('language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'minHour' => 8, 'maxHour' => 18, 'optionIncrement' => array('i' => 5)));
- $formulaire->addElement('date' , 'fin' , 'Fin' , array('language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'optionIncrement' => array('i' => 5), 'minHour' => 8, 'maxHour' => 18));
- $formulaire->addElement('select' , 'id_salle', 'Salle', array(null => '' ) + $forum_appel->obtenirListeSalles($champs['id_forum'], true));
- $formulaire->addElement('text' , 'joindin' , 'Id de la conférence chez joind.in' , array('size' => 40, 'maxlength' => 10));
+ $formulaire->addElement('date' , 'debut' , 'Début', ['language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'minHour' => 8, 'maxHour' => 18, 'optionIncrement' => ['i' => 5]]);
+ $formulaire->addElement('date' , 'fin' , 'Fin' , ['language' => 'fr', 'format' => "dMY H:i", 'minYear' => date('Y'), 'maxYear' => date('Y') + 1, 'optionIncrement' => ['i' => 5], 'minHour' => 8, 'maxHour' => 18]);
+ $formulaire->addElement('select' , 'id_salle', 'Salle', [null => '' ] + $forum_appel->obtenirListeSalles($champs['id_forum'], true));
+ $formulaire->addElement('text' , 'joindin' , 'Id de la conférence chez joind.in' , ['size' => 40, 'maxlength' => 10]);
$formulaire->addElement('header', 'boutons' , '');
$formulaire->addElement('submit', 'soumettre', 'Soumettre');
diff --git a/htdocs/pages/administration/forum_sessions.php b/htdocs/pages/administration/forum_sessions.php
index 0c3be72b8..7b183c641 100644
--- a/htdocs/pages/administration/forum_sessions.php
+++ b/htdocs/pages/administration/forum_sessions.php
@@ -17,9 +17,9 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer'));
-$tris_valides = array('s.titre', 's.date_soumission');
-$sens_valides = array('asc' , 'desc');
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer']);
+$tris_valides = ['s.titre', 's.date_soumission'];
+$sens_valides = ['asc' , 'desc'];
$smarty->assign('action', $action);
$eventRepository = $this->get(EventRepository::class);
@@ -121,14 +121,14 @@
}
}
- $id = isset($_GET['id']) ? $_GET['id'] : 0;
+ $id = $_GET['id'] ?? 0;
$formulaire->addElement('hidden', 'id' , $id);
$formulaire->addElement('hidden', 'id_forum', $_GET['id_forum']);
$formulaire->addElement('header', null, 'Présentation');
- $formulaire->addElement('date' , 'date_soumission', 'Soumission', array('language' => 'fr', 'minYear' => date('Y') -5, 'maxYear' => date('Y') +5));
- $formulaire->addElement('text' , 'titre' , 'Titre' , array('size' => 40, 'maxlength' => 150));
+ $formulaire->addElement('date' , 'date_soumission', 'Soumission', ['language' => 'fr', 'minYear' => date('Y') -5, 'maxYear' => date('Y') +5]);
+ $formulaire->addElement('text' , 'titre' , 'Titre' , ['size' => 40, 'maxlength' => 150]);
$abstractClass = 'simplemde';
$useMarkdown = true;
@@ -137,24 +137,24 @@
$abstractClass = 'tinymce';
}
- $formulaire->addElement('textarea', 'abstract' , 'Résumé', array('cols' => 40, 'rows' => 15,'class'=> $abstractClass));
+ $formulaire->addElement('textarea', 'abstract' , 'Résumé', ['cols' => 40, 'rows' => 15,'class'=> $abstractClass]);
$formulaire->addElement('hidden', 'use_markdown', (int)$useMarkdown);
$typesLabelsByKey = \AppBundle\Event\Model\Talk::getTypeLabelsByKey();
asort($typesLabelsByKey);
- $groupe = array();
+ $groupe = [];
foreach ($typesLabelsByKey as $genreKey => $genreLabel) {
$groupe[] = $formulaire->createElement('radio', 'genre', null, $genreLabel, $genreKey);
}
$formulaire->addGroup($groupe, 'groupe_type_pres', "Type de session", '
', false);
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'plannifie', null, 'Oui', 1);
$groupe[] = $formulaire->createElement('radio', 'plannifie', null, 'Non', 0);
$formulaire->addGroup($groupe, 'groupe_plannifie', "Plannifié", '
', false);
- $groupe = array();
+ $groupe = [];
$groupe[] = $formulaire->createElement('radio', 'skill', null, 'N/A', Talk::SKILL_NA);
$groupe[] = $formulaire->createElement('radio', 'skill', null, 'Junior', Talk::SKILL_JUNIOR);
@@ -164,21 +164,21 @@
$formulaire->addElement('checkbox' , 'needs_mentoring' , "Demande a bénéficier du programme d'accompagnement des jeunes speakers");
$formulaire->addElement('checkbox', 'with_workshop', "Propose un atelier");
- $formulaire->addElement('textarea', 'workshop_abstract', 'Résumé de l\'atelier', array('cols' => 40, 'rows' => 15));
+ $formulaire->addElement('textarea', 'workshop_abstract', 'Résumé de l\'atelier', ['cols' => 40, 'rows' => 15]);
if ($action != 'ajouter') {
- $formulaire->addElement('text' , 'joindin' , 'Id de la conférence chez joind.in' , array('size' => 40, 'maxlength' => 10));
- $formulaire->addElement('text' , 'youtube_id' , 'Id de la conférence sur youtube' , array('size' => 40, 'maxlength' => 30));
- $formulaire->addElement('text' , 'slides_url' , 'URL où trouver les slides' , array('size' => 80, 'maxlength' => 255));
- $formulaire->addElement('text' , 'openfeedback_path' , 'Chemin la conférence sur openfeedback' , array('size' => 80, 'maxlength' => 255));
- $formulaire->addElement('text' , 'blog_post_url' , 'URL de la version article de blog de la conférence' , array('size' => 80, 'maxlength' => 255));
- $formulaire->addElement('text' , 'interview_url' , "URL de l'interview" , array('size' => 80, 'maxlength' => 255));
+ $formulaire->addElement('text' , 'joindin' , 'Id de la conférence chez joind.in' , ['size' => 40, 'maxlength' => 10]);
+ $formulaire->addElement('text' , 'youtube_id' , 'Id de la conférence sur youtube' , ['size' => 40, 'maxlength' => 30]);
+ $formulaire->addElement('text' , 'slides_url' , 'URL où trouver les slides' , ['size' => 80, 'maxlength' => 255]);
+ $formulaire->addElement('text' , 'openfeedback_path' , 'Chemin la conférence sur openfeedback' , ['size' => 80, 'maxlength' => 255]);
+ $formulaire->addElement('text' , 'blog_post_url' , 'URL de la version article de blog de la conférence' , ['size' => 80, 'maxlength' => 255]);
+ $formulaire->addElement('text' , 'interview_url' , "URL de l'interview" , ['size' => 80, 'maxlength' => 255]);
$formulaire->addElement('select', 'language_code', 'Langue', Talk::getLanguageLabelsByKey());
$formulaire->addElement('checkbox' , 'video_has_fr_subtitles' , "Sous titres FR présents");
$formulaire->addElement('checkbox' , 'video_has_en_subtitles' , "Sous titres EN présents");
- $formulaire->addElement('date' , 'date_publication' , 'Date de publication' , array('language' => 'fr', 'format' => "dMYH:i:s", 'minYear' => 2001, 'maxYear' => date('Y') + 5));
+ $formulaire->addElement('date' , 'date_publication' , 'Date de publication' , ['language' => 'fr', 'format' => "dMYH:i:s", 'minYear' => 2001, 'maxYear' => date('Y') + 5]);
$formulaire->addElement('textarea' , 'tweets' , "Tweets", ['style' => "width:100%;min-height:100px"]);
$formulaire->addElement('textarea' , 'transcript' , "Sous titres en français (format SRT)", ['style' => "width:100%;min-height:100px"]);
$formulaire->addElement('textarea', 'verbatim', 'Verbatim', ['cols' => 40, 'rows' => 15,'class'=> 'simplemde']);
diff --git a/htdocs/pages/administration/index.php b/htdocs/pages/administration/index.php
index 11d64ccdd..f0481ad9e 100644
--- a/htdocs/pages/administration/index.php
+++ b/htdocs/pages/administration/index.php
@@ -1,6 +1,6 @@
setDefaults($champs);
$formulaire->addElement('header' , '' , 'Informations');
-$formulaire->addElement('text' , 'raison_sociale' , 'Raison sociale' , array('size' => 30, 'maxlength' => 40));
-$formulaire->addElement('text' , 'siret' , 'Siret' , array('size' => 30, 'maxlength' => 40));
-$formulaire->addElement('textarea', 'adresse' , 'Adresse' , array('cols' => 42, 'rows' => 10));
-$formulaire->addElement('text' , 'code_postal' , 'Code postal' , array('size' => 6, 'maxlength' => 10));
-$formulaire->addElement('text' , 'ville' , 'Ville' , array('size' => 30, 'maxlength' => 50));
+$formulaire->addElement('text' , 'raison_sociale' , 'Raison sociale' , ['size' => 30, 'maxlength' => 40]);
+$formulaire->addElement('text' , 'siret' , 'Siret' , ['size' => 30, 'maxlength' => 40]);
+$formulaire->addElement('textarea', 'adresse' , 'Adresse' , ['cols' => 42, 'rows' => 10]);
+$formulaire->addElement('text' , 'code_postal' , 'Code postal' , ['size' => 6, 'maxlength' => 10]);
+$formulaire->addElement('text' , 'ville' , 'Ville' , ['size' => 30, 'maxlength' => 50]);
$formulaire->addElement('select' , 'id_pays' , 'Pays' , $pays->obtenirPays());
$formulaire->addElement('header' , '' , 'Contact administratif');
-$formulaire->addElement('select' , 'civilite' , 'Civilité' , array('M.', 'Mme', 'Mlle'));
-$formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 30, 'maxlength' => 40));
-$formulaire->addElement('text' , 'prenom' , 'Prénom' , array('size' => 30, 'maxlength' => 40));
-$formulaire->addElement('text' , 'email' , 'Email' , array('size' => 30, 'maxlength' => 100));
-$formulaire->addElement('text' , 'telephone_fixe' , 'Tél. fixe' , array('size' => 20, 'maxlength' => 20));
-$formulaire->addElement('text' , 'telephone_portable' , 'Tél. portable' , array('size' => 20, 'maxlength' => 20));
+$formulaire->addElement('select' , 'civilite' , 'Civilité' , ['M.', 'Mme', 'Mlle']);
+$formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 30, 'maxlength' => 40]);
+$formulaire->addElement('text' , 'prenom' , 'Prénom' , ['size' => 30, 'maxlength' => 40]);
+$formulaire->addElement('text' , 'email' , 'Email' , ['size' => 30, 'maxlength' => 100]);
+$formulaire->addElement('text' , 'telephone_fixe' , 'Tél. fixe' , ['size' => 20, 'maxlength' => 20]);
+$formulaire->addElement('text' , 'telephone_portable' , 'Tél. portable' , ['size' => 20, 'maxlength' => 20]);
$formulaire->addElement('header' , '' , 'Membres associés');
foreach ($users as $user) {
@@ -64,8 +64,8 @@
}
$formulaire->addElement('header' , '' , 'Paramètres');
-$formulaire->addElement('select' , 'etat' , 'Etat' , array(AFUP_DROITS_ETAT_ACTIF => 'Actif',
- AFUP_DROITS_ETAT_INACTIF => 'Inactif'));
+$formulaire->addElement('select' , 'etat' , 'Etat' , [AFUP_DROITS_ETAT_ACTIF => 'Actif',
+ AFUP_DROITS_ETAT_INACTIF => 'Inactif']);
$formulaire->addElement('header' , 'boutons' , '');
$formulaire->addElement('submit' , 'soumettre' , ucfirst($action));
diff --git a/htdocs/pages/administration/paybox_annule.php b/htdocs/pages/administration/paybox_annule.php
index 12763ac97..804de78c3 100644
--- a/htdocs/pages/administration/paybox_annule.php
+++ b/htdocs/pages/administration/paybox_annule.php
@@ -1,5 +1,5 @@
Votre paiement a été annulé. Désolé.";
$paybox .= "Une questions ? N'hésitez pas à contacter le trésorier.
";
diff --git a/htdocs/pages/administration/paybox_effectue.php b/htdocs/pages/administration/paybox_effectue.php
index 78c4449e6..2a8a34375 100644
--- a/htdocs/pages/administration/paybox_effectue.php
+++ b/htdocs/pages/administration/paybox_effectue.php
@@ -1,6 +1,6 @@
Votre paiement a été enregistré. Merci et à bientôt.";
$message .= "Une questions ? N'hésitez pas à contacter le trésorier.
";
diff --git a/htdocs/pages/administration/paybox_erreur.php b/htdocs/pages/administration/paybox_erreur.php
index 91fc4ea10..9320424e6 100644
--- a/htdocs/pages/administration/paybox_erreur.php
+++ b/htdocs/pages/administration/paybox_erreur.php
@@ -1,5 +1,5 @@
Il y a eu une erreur lors de votre paiement. Désolé.";
$paybox .= "Une questions ? N'hésitez pas à contacter le trésorier.
";
diff --git a/htdocs/pages/administration/paybox_refuse.php b/htdocs/pages/administration/paybox_refuse.php
index f0558d095..8c58c2d3b 100644
--- a/htdocs/pages/administration/paybox_refuse.php
+++ b/htdocs/pages/administration/paybox_refuse.php
@@ -7,7 +7,7 @@
exit;
}
-require_once dirname(__FILE__) .'/../../../sources/Afup/Bootstrap/Http.php';
+require_once __DIR__ .'/../../../sources/Afup/Bootstrap/Http.php';
$paybox = "Votre paiement a été refusé. Désolé.
";
$paybox .= "Une questions ? N'hésitez pas à contacter le trésorier.
";
diff --git a/htdocs/pages/administration/personnes_morales.php b/htdocs/pages/administration/personnes_morales.php
index 2c32aed9b..ae33fdfce 100644
--- a/htdocs/pages/administration/personnes_morales.php
+++ b/htdocs/pages/administration/personnes_morales.php
@@ -14,9 +14,9 @@
$userRepository = $this->get(UserRepository::class);
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer'));
-$tris_valides = array('raison_sociale', 'etat');
-$sens_valides = array('asc', 'desc');
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer']);
+$tris_valides = ['raison_sociale', 'etat'];
+$sens_valides = ['asc', 'desc'];
$smarty->assign('action', $action);
$personnes_morales = new Personnes_Morales($bdd);
@@ -67,31 +67,31 @@
$formulaire = instancierFormulaire();
if ($action == 'ajouter') {
- $formulaire->setDefaults(array('civilite' => 'M.',
+ $formulaire->setDefaults(['civilite' => 'M.',
'id_pays' => 'FR',
'niveau' => AFUP_DROITS_NIVEAU_REDACTEUR,
'etat' => AFUP_DROITS_ETAT_ACTIF,
- 'max_members' => 3));
+ 'max_members' => 3]);
} else {
$champs = $personnes_morales->obtenir($_GET['id']);
$formulaire->setDefaults($champs);
}
$formulaire->addElement('header' , '' , 'Informations');
- $formulaire->addElement('text' , 'raison_sociale' , 'Raison sociale' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'siret' , 'Siret' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('textarea', 'adresse' , 'Adresse' , array('cols' => 42, 'rows' => 10));
- $formulaire->addElement('text' , 'code_postal' , 'Code postal' , array('size' => 6, 'maxlength' => 10));
- $formulaire->addElement('text' , 'ville' , 'Ville' , array('size' => 30, 'maxlength' => 50));
+ $formulaire->addElement('text' , 'raison_sociale' , 'Raison sociale' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'siret' , 'Siret' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('textarea', 'adresse' , 'Adresse' , ['cols' => 42, 'rows' => 10]);
+ $formulaire->addElement('text' , 'code_postal' , 'Code postal' , ['size' => 6, 'maxlength' => 10]);
+ $formulaire->addElement('text' , 'ville' , 'Ville' , ['size' => 30, 'maxlength' => 50]);
$formulaire->addElement('select' , 'id_pays' , 'Pays' , $pays->obtenirPays());
$formulaire->addElement('header' , '' , 'Contact administratif');
- $formulaire->addElement('select' , 'civilite' , 'Civilité' , array('M.', 'Mme'));
- $formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'prenom' , 'Prénom' , array('size' => 30, 'maxlength' => 40));
- $formulaire->addElement('text' , 'email' , 'Email' , array('size' => 30, 'maxlength' => 100));
- $formulaire->addElement('text' , 'telephone_fixe' , 'Tél. fixe' , array('size' => 20, 'maxlength' => 20));
- $formulaire->addElement('text' , 'telephone_portable' , 'Tél. portable' , array('size' => 20, 'maxlength' => 20));
+ $formulaire->addElement('select' , 'civilite' , 'Civilité' , ['M.', 'Mme']);
+ $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'prenom' , 'Prénom' , ['size' => 30, 'maxlength' => 40]);
+ $formulaire->addElement('text' , 'email' , 'Email' , ['size' => 30, 'maxlength' => 100]);
+ $formulaire->addElement('text' , 'telephone_fixe' , 'Tél. fixe' , ['size' => 20, 'maxlength' => 20]);
+ $formulaire->addElement('text' , 'telephone_portable' , 'Tél. portable' , ['size' => 20, 'maxlength' => 20]);
if($action != 'ajouter') {
$smarty->assign('personnes_physiques_associees', $users);
}
diff --git a/htdocs/pages/administration/site_articles.php b/htdocs/pages/administration/site_articles.php
index 939bed4e9..3592294b1 100755
--- a/htdocs/pages/administration/site_articles.php
+++ b/htdocs/pages/administration/site_articles.php
@@ -15,9 +15,9 @@
$userRepository = $this->get(UserRepository::class);
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer'));
-$tris_valides = array('titre', 'date');
-$sens_valides = array('asc', 'desc');
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer']);
+$tris_valides = ['titre', 'date'];
+$sens_valides = ['asc', 'desc'];
$smarty->assign('action', $action);
@@ -61,7 +61,7 @@ function checkNoSpace($value): bool
$articlesList = [];
foreach ($articles->obtenirListe($list_champs, $list_ordre.' '.$list_sens, $list_filtre) as $article) {
$article['theme_label'] = Article::getThemeLabel($article['theme']);
- $article['forum_label'] = isset($forumLabelsById[$article['id_forum']]) ? $forumLabelsById[$article['id_forum']] : '';
+ $article['forum_label'] = $forumLabelsById[$article['id_forum']] ?? '';
$articlesList[] = $article;
}
@@ -88,11 +88,11 @@ function checkNoSpace($value): bool
$formulaire = instancierFormulaire();
if ($action == 'ajouter') {
- $formulaire->setDefaults(array('date' => time(),
+ $formulaire->setDefaults(['date' => time(),
'position' => 0,
'id_personne_physique' => $droits->obtenirIdentifiant(),
'type_contenu' => Article::TYPE_CONTENU_MARKDOWN,
- 'etat' => 0));
+ 'etat' => 0]);
} else {
$champs = $article->charger();
$formulaire->setDefaults($article->exportable());
@@ -105,18 +105,18 @@ function checkNoSpace($value): bool
$abstractClass = 'tinymce';
}
- $formulaire->addElement('text' , 'titre' , 'Titre' , array('size' => 60, 'maxlength' => 255));
- $formulaire->addElement('textarea', 'chapeau' , 'Chapeau' , array('cols' => 42, 'rows' => 10, 'class' => $abstractClass));
- $formulaire->addElement('textarea', 'contenu' , 'Contenu' , array('cols' => 42, 'rows' => 20, 'class'=> $abstractClass));
+ $formulaire->addElement('text' , 'titre' , 'Titre' , ['size' => 60, 'maxlength' => 255]);
+ $formulaire->addElement('textarea', 'chapeau' , 'Chapeau' , ['cols' => 42, 'rows' => 10, 'class' => $abstractClass]);
+ $formulaire->addElement('textarea', 'contenu' , 'Contenu' , ['cols' => 42, 'rows' => 20, 'class'=> $abstractClass]);
$formulaire->addElement('hidden', 'type_contenu');
$formulaire->addElement('header' , '' , 'Méta-données');
- $formulaire->addElement('text' , 'raccourci' , 'Raccourci' , array('size' => 60, 'maxlength' => 255));
- $formulaire->addElement('select' , 'id_site_rubrique' , 'Rubrique' , array(null => '' ) + $rubriques->obtenirListe('id, nom', 'nom', null, true));
+ $formulaire->addElement('text' , 'raccourci' , 'Raccourci' , ['size' => 60, 'maxlength' => 255]);
+ $formulaire->addElement('select' , 'id_site_rubrique' , 'Rubrique' , [null => '' ] + $rubriques->obtenirListe('id, nom', 'nom', null, true));
$formulaire->addElement('select' , 'id_personne_physique' , 'Auteur' , $users);
- $formulaire->addElement('date' , 'date' , 'Date' , array('language' => 'fr', 'format' => "dMYH:i:s", 'minYear' => 2001, 'maxYear' => date('Y') + 1));
+ $formulaire->addElement('date' , 'date' , 'Date' , ['language' => 'fr', 'format' => "dMYH:i:s", 'minYear' => 2001, 'maxYear' => date('Y') + 1]);
$formulaire->addElement('select' , 'position' , 'Position' , $article->positionable());
- $formulaire->addElement('select' , 'etat' , 'Etat' , array(-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne'));
+ $formulaire->addElement('select' , 'etat' , 'Etat' , [-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne']);
$formulaire->addElement('select' , 'theme' , 'Thème' , ['' => ''] + Article::getThemesLabels());
$formulaire->addElement('select' , 'id_forum' , 'Forum' , ['' => ''] + $forumLabelsById);
diff --git a/htdocs/pages/administration/site_feuilles.php b/htdocs/pages/administration/site_feuilles.php
index a5ea48029..45b68c3ae 100644
--- a/htdocs/pages/administration/site_feuilles.php
+++ b/htdocs/pages/administration/site_feuilles.php
@@ -11,9 +11,9 @@
exit;
}
-$action = verifierAction(array('lister', 'ajouter', 'modifier', 'supprimer'));
-$tris_valides = array('titre', 'date');
-$sens_valides = array('asc', 'desc');
+$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer']);
+$tris_valides = ['titre', 'date'];
+$sens_valides = ['asc', 'desc'];
$smarty->assign('action', $action);
@@ -21,7 +21,7 @@
$feuilles = new Feuilles($bdd);
if ($action == 'lister') {
- $f = array();
+ $f = [];
$list_champs = '*';
$list_ordre = 'date';
$list_sens = 'desc';
@@ -54,27 +54,27 @@
$formulaire = instancierFormulaire();
if ($action == 'ajouter') {
- $formulaire->setDefaults(array('date' => time(),
+ $formulaire->setDefaults(['date' => time(),
'position' => 0,
'id_personne_physique' => $droits->obtenirIdentifiant(),
- 'etat' => 0));
+ 'etat' => 0]);
} else {
$feuille->charger();
$formulaire->setDefaults($feuille->exportable());
}
$formulaire->addElement('header' , '' , 'feuille');
- $formulaire->addElement('select' , 'id_parent' , 'Parent' , array(null => '' ) + $feuilles->obtenirListe('id, nom', 'nom', true));
- $formulaire->addElement('text' , 'nom' , 'Nom' , array('size' => 60, 'maxlength' => 255));
- $formulaire->addElement('text' , 'lien' , 'Lien' , array('size' => 60, 'maxlength' => 255));
- $formulaire->addElement('text' , 'alt' , 'Description', array('size' => 60, 'maxlength' => 255));
+ $formulaire->addElement('select' , 'id_parent' , 'Parent' , [null => '' ] + $feuilles->obtenirListe('id, nom', 'nom', true));
+ $formulaire->addElement('text' , 'nom' , 'Nom' , ['size' => 60, 'maxlength' => 255]);
+ $formulaire->addElement('text' , 'lien' , 'Lien' , ['size' => 60, 'maxlength' => 255]);
+ $formulaire->addElement('text' , 'alt' , 'Description', ['size' => 60, 'maxlength' => 255]);
$file =& $formulaire->addElement('file', 'nouvelle-image' , 'Image');
$formulaire->addElement('static' , 'note' , '' , '
');
- $formulaire->addElement('text' , 'image_alt' , 'Texte alternatif pour l\'image', array('size' => 60, 'maxlength' => 255));
+ $formulaire->addElement('text' , 'image_alt' , 'Texte alternatif pour l\'image', ['size' => 60, 'maxlength' => 255]);
$formulaire->addElement('hidden' , 'image');
- $formulaire->addElement('date' , 'date' , 'Date' , array('language' => 'fr', 'minYear' => 2001, 'maxYear' => date('Y')));
+ $formulaire->addElement('date' , 'date' , 'Date' , ['language' => 'fr', 'minYear' => 2001, 'maxYear' => date('Y')]);
$formulaire->addElement('select' , 'position' , 'Position' , $feuille->positionable());
- $formulaire->addElement('select' , 'etat' , 'Etat' , array(-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne'));
+ $formulaire->addElement('select' , 'etat' , 'Etat' , [-1 => 'Hors ligne', 0 => 'En attente', 1 => 'En ligne']);
$formulaire->addElement('textarea' , 'patterns' , 'Patterns URL');
$formulaire->addElement('header' , 'boutons' , '');
$formulaire->addElement('submit' , 'soumettre' , ucfirst($action));
@@ -82,7 +82,7 @@
$formulaire->addRule('nom' , 'Nom manquant' , 'required');
$formulaire->addRule('contenu' , 'Contenu manquant' , 'required');
$formulaire->addRule('lien' , 'Lien manquant' , 'required');
- $formulaire->addRule('image' , 'Mimetype' , 'mimetype', array('jpg','jpeg','gif','png'));
+ $formulaire->addRule('image' , 'Mimetype' , 'mimetype', ['jpg','jpeg','gif','png']);
if ($file->isUploadedFile()) {
$values = $file->getValue();
diff --git a/htdocs/pages/event-payment/index.php b/htdocs/pages/event-payment/index.php
index badf6c5d2..508c4c204 100644
--- a/htdocs/pages/event-payment/index.php
+++ b/htdocs/pages/event-payment/index.php
@@ -4,7 +4,7 @@
use Afup\Site\Utils\SymfonyKernel;
use AppBundle\Payment\PayboxFactory;
-require_once dirname(__FILE__) .'/../../../sources/Afup/Bootstrap/Http.php';
+require_once __DIR__ .'/../../../sources/Afup/Bootstrap/Http.php';
if (
!isset($_GET['ref'])
diff --git a/htdocs/pages/event-payment/paybox_annule.php b/htdocs/pages/event-payment/paybox_annule.php
index 092dbde46..d13db448b 100644
--- a/htdocs/pages/event-payment/paybox_annule.php
+++ b/htdocs/pages/event-payment/paybox_annule.php
@@ -1,3 +1,3 @@
display('paybox_annule.html');
diff --git a/htdocs/pages/event-payment/paybox_effectue.php b/htdocs/pages/event-payment/paybox_effectue.php
index 750ea2fde..696fa68eb 100644
--- a/htdocs/pages/event-payment/paybox_effectue.php
+++ b/htdocs/pages/event-payment/paybox_effectue.php
@@ -1,3 +1,3 @@
display('paybox_effectue.html');
\ No newline at end of file
diff --git a/htdocs/pages/event-payment/paybox_erreur.php b/htdocs/pages/event-payment/paybox_erreur.php
index b9ba45358..9fe3384db 100644
--- a/htdocs/pages/event-payment/paybox_erreur.php
+++ b/htdocs/pages/event-payment/paybox_erreur.php
@@ -1,3 +1,3 @@
display('paybox_erreur.html');
diff --git a/htdocs/pages/event-payment/paybox_refuse.php b/htdocs/pages/event-payment/paybox_refuse.php
index 1ac50aae7..8ec06be1c 100644
--- a/htdocs/pages/event-payment/paybox_refuse.php
+++ b/htdocs/pages/event-payment/paybox_refuse.php
@@ -1,3 +1,3 @@
display('paybox_refuse.html');
diff --git a/htdocs/pages/paiement/index.php b/htdocs/pages/paiement/index.php
index 842d67ae6..40c98da05 100644
--- a/htdocs/pages/paiement/index.php
+++ b/htdocs/pages/paiement/index.php
@@ -3,7 +3,7 @@
use Afup\Site\Utils\SymfonyKernel;
use AppBundle\Payment\PayboxFactory;
-require_once dirname(__FILE__) .'/../../../sources/Afup/Bootstrap/Http.php';
+require_once __DIR__ .'/../../../sources/Afup/Bootstrap/Http.php';
$comptaFact = new Facture($bdd);
diff --git a/htdocs/pages/paiement/paybox_annule.php b/htdocs/pages/paiement/paybox_annule.php
index 092dbde46..d13db448b 100644
--- a/htdocs/pages/paiement/paybox_annule.php
+++ b/htdocs/pages/paiement/paybox_annule.php
@@ -1,3 +1,3 @@
display('paybox_annule.html');
diff --git a/htdocs/pages/paiement/paybox_effectue.php b/htdocs/pages/paiement/paybox_effectue.php
index 750ea2fde..696fa68eb 100644
--- a/htdocs/pages/paiement/paybox_effectue.php
+++ b/htdocs/pages/paiement/paybox_effectue.php
@@ -1,3 +1,3 @@
display('paybox_effectue.html');
\ No newline at end of file
diff --git a/htdocs/pages/paiement/paybox_erreur.php b/htdocs/pages/paiement/paybox_erreur.php
index b9ba45358..9fe3384db 100644
--- a/htdocs/pages/paiement/paybox_erreur.php
+++ b/htdocs/pages/paiement/paybox_erreur.php
@@ -1,3 +1,3 @@
display('paybox_erreur.html');
diff --git a/htdocs/pages/paiement/paybox_refuse.php b/htdocs/pages/paiement/paybox_refuse.php
index 1ac50aae7..8ec06be1c 100644
--- a/htdocs/pages/paiement/paybox_refuse.php
+++ b/htdocs/pages/paiement/paybox_refuse.php
@@ -1,3 +1,3 @@
display('paybox_refuse.html');
diff --git a/htdocs/pages/paiement/payment_tracking.php b/htdocs/pages/paiement/payment_tracking.php
index 91fb53661..76705f45c 100644
--- a/htdocs/pages/paiement/payment_tracking.php
+++ b/htdocs/pages/paiement/payment_tracking.php
@@ -1,7 +1,7 @@
withPaths([
+ __DIR__ . '/app',
+ __DIR__ . '/db',
+ __DIR__ . '/htdocs',
+ //__DIR__ . '/sources',
+ //__DIR__ . '/tests',
+ ])
+ ->withSkip([
+ __DIR__ . '/htdocs/cache',
+ ])
+ ->withPhp74Sets()
+ //->withTypeCoverageLevel(0)
+ //->withDeadCodeLevel(0)
+ //->withCodeQualityLevel(0)
+ //->withSymfonyContainerXml(__DIR__ . '/var/cache/dev/appAppKernelDevDebugContainer.xml')
+ //->withSets([
+ // SymfonySetList::SYMFONY_44,
+ // SymfonySetList::SYMFONY_CODE_QUALITY,
+ // SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
+ //])
+;
diff --git a/sources/AppBundle/Controller/SiteBaseController.php b/sources/AppBundle/Controller/SiteBaseController.php
index 3edefc761..a72b7c263 100644
--- a/sources/AppBundle/Controller/SiteBaseController.php
+++ b/sources/AppBundle/Controller/SiteBaseController.php
@@ -9,23 +9,20 @@
abstract class SiteBaseController extends Controller implements SiteControllerInterface
{
- protected $defaultBlocks = [];
+ protected array $defaultBlocks = [];
- /**
- * @var Configuration
- */
- protected $legacyConfiguration;
+ protected Configuration $legacyConfiguration;
/**
* @inheritDoc
* @deprecated use BlocksHandler
*/
- public function setDefaultBlocks(array $blocks)
+ public function setDefaultBlocks(array $blocks): void
{
$this->defaultBlocks = $blocks;
}
- public function setConfiguration(Configuration $conf)
+ public function setConfiguration(Configuration $conf): void
{
$this->legacyConfiguration = $conf;
}
@@ -33,7 +30,7 @@ public function setConfiguration(Configuration $conf)
/**
* @inheritDoc
*/
- protected function render($view, array $parameters = [], Response $response = null)
+ protected function render($view, array $parameters = [], Response $response = null): Response
{
return parent::render($view, $parameters + $this->defaultBlocks, $response);
}
diff --git a/sources/AppBundle/Event/Form/SpeakerType.php b/sources/AppBundle/Event/Form/SpeakerType.php
index 5db5dc1dd..0e793f267 100644
--- a/sources/AppBundle/Event/Form/SpeakerType.php
+++ b/sources/AppBundle/Event/Form/SpeakerType.php
@@ -21,31 +21,28 @@
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
class SpeakerType extends AbstractType
{
- const OPT_PHOTO_REQUIRED = 'photo_required';
- const OPT_USER_GITHUB = 'user_github';
+ public const OPT_PHOTO_REQUIRED = 'photo_required';
+ public const OPT_USER_GITHUB = 'user_github';
- /** @var GithubUserRepository */
- private $githubUserRepository;
- /** @var SpeakerRepository */
- private $speakerRepository;
- /** @var TokenStorage */
- private $tokenStorage;
+ private GithubUserRepository $githubUserRepository;
+ private SpeakerRepository $speakerRepository;
+ private TokenStorageInterface $tokenStorage;
public function __construct(
GithubUserRepository $githubUserRepository,
SpeakerRepository $speakerRepository,
- TokenStorage $tokenStorage
+ TokenStorageInterface $tokenStorage
) {
$this->githubUserRepository = $githubUserRepository;
$this->speakerRepository = $speakerRepository;
$this->tokenStorage = $tokenStorage;
}
- public function buildForm(FormBuilderInterface $builder, array $options)
+ public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('civility', ChoiceType::class, ['choices' => ['M' => 'M', 'Mme' => 'Mme']])
@@ -61,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
;
if (true === $options[self::OPT_USER_GITHUB]) {
- // mieux vaudrait passer par un option référeent ou "saisie dans le BO", mais le bug
+ // il vaudrait mieux passer par une option référent ou "saisie dans le BO", mais le bug
// a été vu lors du Forum PHP 2022, on est pragmatique et le corrige au plus vite.
$builder
->add('referent_person', TextType::class, ['required' => false, 'property_path' => 'referentPerson', 'label' => 'Personne référente'])
@@ -119,7 +116,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
});
}
- public function configureOptions(OptionsResolver $resolver)
+ public function configureOptions(OptionsResolver $resolver): void
{
$resolver
->setDefaults([
diff --git a/sources/AppBundle/Security/MyGithubAuthenticator.php b/sources/AppBundle/Security/MyGithubAuthenticator.php
index 4a8e74d8c..1d9842edc 100644
--- a/sources/AppBundle/Security/MyGithubAuthenticator.php
+++ b/sources/AppBundle/Security/MyGithubAuthenticator.php
@@ -6,7 +6,7 @@
use AppBundle\Event\Model\GithubUser;
use AppBundle\Event\Model\Repository\GithubUserRepository;
use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
-use KnpU\OAuth2ClientBundle\Client\Provider\GithubClient;
+use KnpU\OAuth2ClientBundle\Client\OAuth2ClientInterface;
use KnpU\OAuth2ClientBundle\Security\Authenticator\SocialAuthenticator;
use League\OAuth2\Client\Provider\GithubResourceOwner;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -19,9 +19,9 @@
class MyGithubAuthenticator extends SocialAuthenticator
{
- private $clientRegistry;
- private $githubUserRepository;
- private $router;
+ private ClientRegistry $clientRegistry;
+ private GithubUserRepository $githubUserRepository;
+ private RouterInterface $router;
public function __construct(ClientRegistry $clientRegistry, GithubUserRepository $githubUserRepository, RouterInterface $router)
{
@@ -32,11 +32,6 @@ public function __construct(ClientRegistry $clientRegistry, GithubUserRepository
public function getCredentials(Request $request)
{
- if ($request->attributes->get('_route') !== 'connection_github_check') {
- // don't auth
- return;
- }
-
return $this->fetchAccessToken($this->getGithubClient());
}
@@ -67,10 +62,7 @@ public function getUser($credentials, UserProviderInterface $userProvider)
return $user;
}
- /**
- * @return GithubClient
- */
- private function getGithubClient()
+ private function getGithubClient(): OAuth2ClientInterface
{
return $this->clientRegistry
// "github_main" is the key used in config.yml
@@ -107,4 +99,9 @@ public function start(Request $request, AuthenticationException $authException =
{
return new RedirectResponse($this->router->generate('connection_github'));
}
+
+ public function supports(Request $request): bool
+ {
+ return $request->attributes->get('_route') === 'connection_github_check';
+ }
}
diff --git a/sources/AppBundle/Security/TestGithubAuthenticator.php b/sources/AppBundle/Security/TestGithubAuthenticator.php
index e5220eda0..52b8e6bfb 100644
--- a/sources/AppBundle/Security/TestGithubAuthenticator.php
+++ b/sources/AppBundle/Security/TestGithubAuthenticator.php
@@ -16,8 +16,8 @@
class TestGithubAuthenticator extends SocialAuthenticator
{
- private $githubUserRepository;
- private $router;
+ private GithubUserRepository $githubUserRepository;
+ private RouterInterface $router;
public function __construct(GithubUserRepository $githubUserRepository, RouterInterface $router)
{
@@ -34,7 +34,6 @@ public function getUser($credentials, UserProviderInterface $userProvider)
{
$githubUsers = $this->getTestUsersDetails();
-
if (!isset($githubUsers[$credentials])) {
throw new \RuntimeException('Test user not found');
}
@@ -60,7 +59,7 @@ public function getUser($credentials, UserProviderInterface $userProvider)
return $user;
}
- private function getTestUsersDetails()
+ private function getTestUsersDetails(): array
{
$testUsers = [];
@@ -125,4 +124,9 @@ public function start(Request $request, AuthenticationException $authException =
}
return new Response($body);
}
+
+ public function supports(Request $request): bool
+ {
+ return true;
+ }
}