Merge branch 'cs-fixes'

codedmonkey · codedmonkey · commit 649079897671 · 2025-06-06T15:24:22.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile b/Dockerfile
@@ -87,7 +87,7 @@ WORKDIR /srv/app
 
 COPY --chown=$UID:$GID --from=composer_build /srv/app ./
 COPY --chown=$UID:$GID --from=node_build /srv/app/public/build public/build/
-COPY --chown=$UID:$GID readme.md license.md ./
+COPY --chown=$UID:$GID README.md LICENSE.md CHANGELOG.md ./
 COPY --chown=$UID:$GID bin/console bin/dirigent bin/
 COPY --chown=$UID:$GID docker/config.yaml config/dirigent.yaml
 COPY --chown=$UID:$GID docker/env.php ./.env.dirigent.local.php
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -53,6 +53,6 @@ Dirigent is developed by [Coded Monkey][codedmonkey].
 [docs]: docs/readme.md
 [docs-install]: docs/installation/readme.md
 [github-issues]: https://github.com/codedmonkey/dirigent/issues
-[license]: license.md
+[license]: LICENSE.md
 [packagist]: https://packagist.org
 [php]: https://php.net
diff --git a/composer.json b/composer.json
@@ -3,7 +3,6 @@
     "description": "A free and open package registry for Composer",
     "type": "project",
     "license": "FSL-1.1-MIT",
-    "readme": "readme.md",
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
diff --git a/src/Doctrine/Entity/AbstractPackageLink.php b/src/Doctrine/Entity/AbstractPackageLink.php
@@ -6,7 +6,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\MappedSuperclass]
-abstract class PackageLink
+abstract class AbstractPackageLink
 {
     #[ORM\Id]
     #[ORM\Column]
diff --git a/src/Doctrine/Entity/ConflictLink.php b/src/Doctrine/Entity/ConflictLink.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class ConflictLink extends PackageLink
+class ConflictLink extends AbstractPackageLink
 {
     #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'conflict')]
     #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Doctrine/Entity/DevRequireLink.php b/src/Doctrine/Entity/DevRequireLink.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class DevRequireLink extends PackageLink
+class DevRequireLink extends AbstractPackageLink
 {
     #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'devRequire')]
     #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Doctrine/Entity/ProvideLink.php b/src/Doctrine/Entity/ProvideLink.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class ProvideLink extends PackageLink
+class ProvideLink extends AbstractPackageLink
 {
     #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'provide')]
     #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Doctrine/Entity/ReplaceLink.php b/src/Doctrine/Entity/ReplaceLink.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class ReplaceLink extends PackageLink
+class ReplaceLink extends AbstractPackageLink
 {
     #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'replace')]
     #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Doctrine/Entity/RequireLink.php b/src/Doctrine/Entity/RequireLink.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class RequireLink extends PackageLink
+class RequireLink extends AbstractPackageLink
 {
     #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'require')]
     #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Doctrine/Entity/SuggestLink.php b/src/Doctrine/Entity/SuggestLink.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class SuggestLink extends PackageLink
+class SuggestLink extends AbstractPackageLink
 {
     #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'suggest')]
     #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Doctrine/Entity/Version.php b/src/Doctrine/Entity/Version.php
@@ -681,7 +681,7 @@ public function toComposerArray(): array
         }
 
         foreach ($supportedLinkTypes as $method => $linkType) {
-            /** @var PackageLink $link */
+            /** @var AbstractPackageLink $link */
             foreach ($this->{'get' . $method}() as $link) {
                 $link = $link->toArray();
                 $data[$linkType][key($link)] = current($link);
diff --git a/templates/dashboard/credentials/_js_assets.html.twig b/templates/dashboard/credentials/_js_assets.html.twig
diff --git a/templates/dashboard/credentials/layout.html.twig b/templates/dashboard/credentials/layout.html.twig
@@ -3,5 +3,5 @@
 {% block body_javascript %}
   {{ parent() }}
 
-  {{ include('dashboard/credentials/js_assets.html.twig') }}
+  {{ include('dashboard/credentials/_js_assets.html.twig') }}
 {% endblock %}
diff --git a/templates/dashboard/index.html.twig b/templates/dashboard/index.html.twig
@@ -3,7 +3,7 @@
 {% block page_title %}{{ ea.dashboardTitle }}{% endblock %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' %}
+  {% include 'dashboard/packages/_search_box.html.twig' %}
 {% endblock %}
 
 {% block page_content %}
diff --git a/templates/dashboard/packages/_package_header.html.twig b/templates/dashboard/packages/_package_header.html.twig
diff --git a/templates/dashboard/packages/_search_box.html.twig b/templates/dashboard/packages/_search_box.html.twig
diff --git a/templates/dashboard/packages/list.html.twig b/templates/dashboard/packages/list.html.twig
@@ -3,7 +3,7 @@
 {% block page_title %}Packages{% endblock %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' %}
+  {% include 'dashboard/packages/_search_box.html.twig' %}
 {% endblock %}
 
 {% block page_actions %}
diff --git a/templates/dashboard/packages/package_base.html.twig b/templates/dashboard/packages/package_base.html.twig
@@ -1,7 +1,7 @@
 {% extends '@EasyAdmin/page/content.html.twig' %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' with {searchAutofocus: false} %}
+  {% include 'dashboard/packages/_search_box.html.twig' with {searchAutofocus: false} %}
 {% endblock %}
 
 {% block page_actions %}
diff --git a/templates/dashboard/packages/package_edit.html.twig b/templates/dashboard/packages/package_edit.html.twig
@@ -3,7 +3,7 @@
 {% block page_title %}Edit Package{% endblock %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' with {searchAutofocus: false} %}
+  {% include 'dashboard/packages/_search_box.html.twig' with {searchAutofocus: false} %}
 {% endblock %}
 
 {% block page_actions %}
diff --git a/templates/dashboard/packages/package_info.html.twig b/templates/dashboard/packages/package_info.html.twig
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/package_header.html.twig' with {currentPage: 'info'} %}
+  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: 'info'} %}
 
   <div class="row mb-3">
     <div class="col-md-8">
diff --git a/templates/dashboard/packages/package_statistics.html.twig b/templates/dashboard/packages/package_statistics.html.twig
@@ -3,7 +3,7 @@
 {% block page_title %}{{ package.name }} <small>{{ 'Statistics'|trans }}</small>{% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/package_header.html.twig' with {currentPage: 'statistics'} %}
+  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: 'statistics'} %}
 
   <div class="mb-3">
     <h2>{{ 'Installations'|trans }}</h2>
diff --git a/templates/dashboard/packages/package_versions.html.twig b/templates/dashboard/packages/package_versions.html.twig
@@ -3,7 +3,7 @@
 {% block page_title %}{{ package.name }} <small>{{ 'Versions'|trans }}</small>{% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/package_header.html.twig' with {currentPage: 'versions'} %}
+  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: 'versions'} %}
 
   <div class="list-group list-group-flush mb-3">
     {% for version in versions %}
diff --git a/tests/FunctionalTests/Controller/ApiControllerPublicTest.php b/tests/FunctionalTests/Controller/ApiControllerPublicTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CodedMonkey\Dirigent\Tests\FunctionalTests;
+namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller;
 
-use CodedMonkey\Dirigent\Tests\PublicKernel;
+use CodedMonkey\Dirigent\Tests\FunctionalTests\PublicKernel;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/FunctionalTests/Controller/Dashboard/DashboardPackagesControllerTest.php b/tests/FunctionalTests/Controller/Dashboard/DashboardPackagesControllerTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace CodedMonkey\Dirigent\Tests\FunctionalTests;
+namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
 
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
 use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
+use CodedMonkey\Dirigent\Tests\FunctionalTests\WebTestCaseTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class DashboardPackagesControllerTest extends WebTestCase
diff --git a/tests/FunctionalTests/Controller/Dashboard/DashboardRootControllerPublicTest.php b/tests/FunctionalTests/Controller/Dashboard/DashboardRootControllerPublicTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CodedMonkey\Dirigent\Tests\FunctionalTests;
+namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
 
-use CodedMonkey\Dirigent\Tests\PublicKernel;
+use CodedMonkey\Dirigent\Tests\FunctionalTests\PublicKernel;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class DashboardRootControllerPublicTest extends WebTestCase
diff --git a/tests/FunctionalTests/Controller/Dashboard/DashboardRootControllerTest.php b/tests/FunctionalTests/Controller/Dashboard/DashboardRootControllerTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace CodedMonkey\Dirigent\Tests\FunctionalTests;
+namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
 
 use CodedMonkey\Dirigent\Kernel;
+use CodedMonkey\Dirigent\Tests\FunctionalTests\WebTestCaseTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class DashboardRootControllerTest extends WebTestCase
diff --git a/tests/FunctionalTests/PublicKernel.php b/tests/FunctionalTests/PublicKernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodedMonkey\Dirigent\Tests;
+namespace CodedMonkey\Dirigent\Tests\FunctionalTests;
 
 use CodedMonkey\Dirigent\Kernel;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Doctrine\ORM\Mapping as ORM;`
`7`	`7`
`8`	`8`	`#[ORM\MappedSuperclass]`
`9`		`-abstract class PackageLink`
	`9`	`+abstract class AbstractPackageLink`
`10`	`10`	`{`
`11`	`11`	`#[ORM\Id]`
`12`	`12`	`#[ORM\Column]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Doctrine\ORM\Mapping as ORM;`
`6`	`6`
`7`	`7`	`#[ORM\Entity]`
`8`		`-class ConflictLink extends PackageLink`
	`8`	`+class ConflictLink extends AbstractPackageLink`
`9`	`9`	`{`
`10`	`10`	`#[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'conflict')]`
`11`	`11`	`#[ORM\JoinColumn(nullable: false)]`