Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: php-cs-fixer #154

Merged
merged 8 commits into from
Sep 9, 2024
Merged

Feat: php-cs-fixer #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
64f5483
Feat: php-cs-fixer
Rom1-B Sep 5, 2024
599f570
fix rules
Rom1-B Sep 5, 2024
ebce427
clean config
Rom1-B Sep 5, 2024
25306d8
clean rules
Rom1-B Sep 6, 2024
e6acf11
trailing_comma_in_multiline
Rom1-B Sep 6, 2024
4893b3b
Revert "trailing_comma_in_multiline"
Rom1-B Sep 6, 2024
7529afb
php 7.4 compatiblity
Rom1-B Sep 6, 2024
36db86c
remove php_codesniffer
Rom1-B Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

use PhpCsFixer\Config;
use PhpCsFixer\Finder;

$finder = Finder::create()
->in(__DIR__)
->name('*.php');

$config = new Config();

$rules = [
'@PER-CS2.0' => true,
'trailing_comma_in_multiline' => ['elements' => ['arguments', 'array_destructuring', 'arrays']], // For PHP 7.4 compatibility
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PER 2.0 is an extension of the PER 1.0 (the new name of the PSR 12) and its specifications are not compatible on some points with PHP 7.x.

There are 2 solutions for this:

  1. Use the PSR 12 right now and move to the PER 2.0 later.
  2. Use the PER 2.0 right now with some overriden rules, and remove these overrides later.

Both are OK to me, but I guess that the current solution will be less subject to conflicts and is therefore preferable.

];

return $config
->setRules($rules)
->setFinder($finder)
->setUsingCache(false);
4 changes: 2 additions & 2 deletions ajax/display_alerts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*/

$AJAX_INCLUDE = 1;
include("../../../inc/includes.php");
header("Content-Type: text/html; charset=UTF-8");
include('../../../inc/includes.php');
header('Content-Type: text/html; charset=UTF-8');
Html::header_nocache();
Session::checkLoginUser();

Expand Down
4 changes: 2 additions & 2 deletions ajax/hide_alert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*/

$AJAX_INCLUDE = 1;
include("../../../inc/includes.php");
header("Content-Type: text/html; charset=UTF-8");
include('../../../inc/includes.php');
header('Content-Type: text/html; charset=UTF-8');
Html::header_nocache();
Session::checkLoginUser();

Expand Down
26 changes: 13 additions & 13 deletions ajax/targets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
*/

$AJAX_INCLUDE = 1;
include("../../../inc/includes.php");
header("Content-Type: text/html; charset=UTF-8");
include('../../../inc/includes.php');
header('Content-Type: text/html; charset=UTF-8');
Html::header_nocache();

Session::checkLoginUser();

if (isset($_POST['type']) && !empty($_POST['type'])) {
echo "<table class='tab_format'>";
echo "<tr>";
echo "<td>";
echo '<tr>';
echo '<td>';
switch ($_POST['type']) {
case 'User':
User::dropdown(['name' => 'items_id',
'right' => 'all',
'entity' => $_POST['entities_id'],
'entity_sons' => $_POST['is_recursive'],
User::dropdown(['name' => 'items_id',
'right' => 'all',
'entity' => $_POST['entities_id'],
'entity_sons' => $_POST['is_recursive'],
]);
break;

Expand All @@ -53,14 +53,14 @@
break;

case 'Profile':
Profile::dropdown(['name' => 'items_id',
'toadd' => [-1 => __('All', 'news')]
Profile::dropdown(['name' => 'items_id',
'toadd' => [-1 => __('All', 'news')],
]);
break;
}
echo "</td>";
echo '</td>';
echo "<td><input type='submit' name='addvisibility' value=\"" . _sx('button', 'Add', 'news') . "\"
class='submit'></td>";
echo "</tr>";
echo "</table>";
echo '</tr>';
echo '</table>';
}
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"php": ">=7.4"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.64",
"glpi-project/tools": "^0.7.3",
"php-parallel-lint/php-parallel-lint": "^1.4",
"phpstan/phpstan": "^1.12",
"squizlabs/php_codesniffer": "^3.10"
"phpstan/phpstan": "^1.12"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading