Skip to content

Commit

Permalink
cleans composer dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Elorfin
Elorfin committed Apr 21, 2023
1 parent 0bd57a9 commit 468d80c
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: "Run PHPMD checks"
if: ${{ env.DIFF != '' }}
run: php phpmd `echo "$DIFF" | tr ' ' ','` github phpmd.xml
run: php phpmd `echo "$DIFF" | tr ' ' ','` text phpmd.xml --minimum-priority 1
env:
DIFF: ${{ steps.diff.outputs.diff_php }}

Expand Down
25 changes: 5 additions & 20 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,58 +52,43 @@
"postal/postal": "^1.0",
"psr/log": "1.0.2",
"ramsey/uuid": "^3.7",
"symfony/maker-bundle": "^1.2",
"sensio/framework-extra-bundle": "^5.6",
"stefk/jval": "dev-master",
"stof/doctrine-extensions-bundle": "1.6.0",
"symfony/monolog-bundle": "^3.5",
"symfony/asset": "4.4.*",
"symfony/browser-kit": "4.4.*",
"symfony/cache": "4.4.*",
"symfony/config": "4.4.*",
"symfony/console": "4.4.*",
"symfony/debug-bundle": "4.4.*",
"symfony/dependency-injection": "4.4.*",
"symfony/doctrine-bridge": "4.4.*",
"symfony/doctrine-messenger": "^5.2",
"symfony/dotenv": "4.4.*",
"symfony/error-handler": "4.4.*",
"symfony/event-dispatcher": "4.4.*",
"symfony/filesystem": "4.4.*",
"symfony/finder": "4.4.*",
"symfony/framework-bundle": "4.4.*",
"symfony/google-mailer": "4.4.*",
"symfony/http-client": "4.4.*",
"symfony/intl": "4.4.*",
"symfony/mailer": "4.4.*",
"symfony/messenger": "^5.2",
"symfony/monolog-bridge": "4.4.*",
"symfony/process": "4.4.*",
"symfony/redis-messenger": "^5.2",
"symfony/routing": "4.4.*",
"symfony/security-bundle": "4.4.*",
"symfony/security-core": "4.4.*",
"symfony/security-guard": "4.4.*",
"symfony/security-http": "4.4.*",
"symfony/translation": "4.4.*",
"symfony/twig-bridge": "4.4.*",
"symfony/twig-bundle": "4.4.*",
"symfony/validator": "4.4.*",
"symfony/var-dumper": "4.4.*",
"symfony/web-profiler-bundle": "4.4.*",
"symfony/yaml": "4.4.*",
"twig/twig": "^2.14",
"willdurand/js-translation-bundle": "^4.0",
"http-interop/http-factory-guzzle": "^1.2"
},
"require-dev": {
"symfony/dom-crawler": "4.4.*",
"symfony/css-selector": "4.4.*",
"phpunit/phpunit": "^9.5",
"friendsofphp/php-cs-fixer": "^2.15",
"mockery/mockery": "^1.2",
"mikey179/vfsstream": "1.6.8",
"mockery/mockery": "^1.2",
"phpmd/phpmd": "^2.13",
"symfony/phpunit-bridge": "^4.4"
"symfony/phpunit-bridge": "^4.4",
"symfony/web-profiler-bundle": "4.4.*",
"symfony/debug-bundle": "^4.4"
},
"autoload": {
"psr-4": {
Expand Down
99 changes: 71 additions & 28 deletions phpmd.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0"?>

<!-- see https://phpmd.org/rules/index.html -->
<!-- see http://phpmd.org/documentation/creating-a-ruleset.html -->
<!-- see https://github.com/phpmd/phpmd -->

<ruleset
name="Claroline distribution PHPMD rule set"
Expand All @@ -13,32 +11,77 @@
>
<description>Code checks</description>

<rule ref="rulesets/cleancode.xml/IfStatementAssignment" />
<rule ref="rulesets/cleancode.xml/DuplicatedArrayKey" />
<rule ref="rulesets/cleancode.xml/ErrorControlOperator" />
<rule ref="rulesets/cleancode.xml/UndefinedVariable" />
<rule ref="rulesets/cleancode.xml/IfStatementAssignment">
<priority>1</priority>
</rule>
<rule ref="rulesets/cleancode.xml/DuplicatedArrayKey">
<priority>1</priority>
</rule>
<rule ref="rulesets/cleancode.xml/ErrorControlOperator">
<priority>1</priority>
</rule>
<rule ref="rulesets/cleancode.xml/UndefinedVariable">
<priority>1</priority>
</rule>
<rule ref="rulesets/unusedcode.xml/UnusedPrivateField">
<priority>1</priority>
</rule>
<rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod">
<priority>1</priority>
</rule>
<rule ref="rulesets/unusedcode.xml/UnusedLocalVariable">
<priority>1</priority>
</rule>
<rule ref="rulesets/design.xml/ExitExpression">
<priority>1</priority>
</rule>
<rule ref="rulesets/design.xml/EvalExpression">
<priority>1</priority>
</rule>
<rule ref="rulesets/design.xml/GotoStatement">
<priority>1</priority>
</rule>
<rule ref="rulesets/design.xml/DevelopmentCodeFragment">
<priority>1</priority>
</rule>
<rule ref="rulesets/naming.xml/ConstantNamingConventions">
<priority>1</priority>
</rule>
<rule ref="rulesets/controversial.xml/Superglobals">
<priority>1</priority>
</rule>
<rule ref="rulesets/controversial.xml/CamelCaseClassName">
<priority>1</priority>
</rule>
<rule ref="rulesets/controversial.xml/CamelCasePropertyName">
<priority>1</priority>
</rule>
<rule ref="rulesets/controversial.xml/CamelCaseMethodName">
<priority>1</priority>
</rule>
<rule ref="rulesets/controversial.xml/CamelCaseParameterName">
<priority>1</priority>
</rule>
<rule ref="rulesets/controversial.xml/CamelCaseVariableName">
<priority>1</priority>
</rule>

<rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
<rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
<rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
<!-- These rules are not checked in the CI because it will need too many work to have them all -->
<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter">
<!-- It also throws an error when params are declared to follow the parent method's prototype -->
<priority>2</priority>
</rule>
<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
<priority>2</priority>
</rule>
<rule ref="rulesets/codesize.xml/ExcessiveParameterList">
<priority>2</priority>
</rule>
<rule ref="rulesets/codesize.xml/ExcessivePublicCount">
<priority>2</priority>
</rule>

<rule ref="rulesets/design.xml/ExitExpression" />
<rule ref="rulesets/design.xml/EvalExpression" />
<rule ref="rulesets/design.xml/GotoStatement" />
<rule ref="rulesets/design.xml/DevelopmentCodeFragment" />

<rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
<rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
<rule ref="rulesets/codesize.xml/ExcessivePublicCount" />

<rule ref="rulesets/naming.xml/BooleanGetMethodName" />
<rule ref="rulesets/naming.xml/ConstantNamingConventions" />

<rule ref="rulesets/controversial.xml/Superglobals" />
<rule ref="rulesets/controversial.xml/CamelCaseClassName" />
<rule ref="rulesets/controversial.xml/CamelCasePropertyName" />
<rule ref="rulesets/controversial.xml/CamelCaseMethodName" />
<rule ref="rulesets/controversial.xml/CamelCaseParameterName" />
<rule ref="rulesets/controversial.xml/CamelCaseVariableName" />
<rule ref="rulesets/naming.xml/BooleanGetMethodName">
<priority>2</priority>
</rule>
</ruleset>
7 changes: 0 additions & 7 deletions src/main/app/Log/FileLogger.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,4 @@ public static function get($logFile, $name = 'default.claroline.logger')

return $fileLogger;
}

//make the interface happy altough we don't use it -,-.
//that way we can use the same parmaeter order than the sf2 one
public function log($level, $log, array $context = [])
{
parent::log($level, $log, $context);
}
}
2 changes: 0 additions & 2 deletions src/main/dev/ClarolineDevBundle.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Claroline\KernelBundle\Bundle\AutoConfigurableInterface;
use Symfony\Bundle\DebugBundle\DebugBundle;
use Symfony\Bundle\MakerBundle\MakerBundle;
use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
Expand All @@ -23,7 +22,6 @@ public function getRequiredBundles(string $environment): array
return [
new WebProfilerBundle(),
new DebugBundle(),
new MakerBundle(),
];
}

Expand Down
6 changes: 0 additions & 6 deletions src/plugin/exo/Tests/Controller/ExerciseControllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,7 @@ protected function setUp(): void
public function testAnonymousGet()
{
$this->request('GET', "/apiv2/exercises/{$this->exercise->getUuid()}");

/*var_dump($this->client->getResponse()->getContent());
die();*/

$this->assertEquals(401, $this->client->getResponse()->getStatusCode());


}

public function testNonCreatorGet()
Expand Down

0 comments on commit 468d80c

Please sign in to comment.