Minor cleanups

composer · Oct 24, 2023 · cc1639d · cc1639d
1 parent 87dee24
commit cc1639d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/js/charts.js b/js/charts.js
@@ -135,7 +135,7 @@ import '../css/charts.css';
         );
     });
 
-    window.initPackageStats = function (average, date, versions, statsUrl, versionStatsUrl) {
+    window.initPackageStats = function (average, date, statsUrl, versionStatsUrl) {
         colors = [
             '#f28d1a',
             '#1765f4',
@@ -274,7 +274,7 @@ import '../css/charts.css';
         initializeVersionListExpander();
     };
 
-    window.initPhpStats = function (average, date, versions, versionStatsUrl) {
+    window.initPhpStats = function (average, date, versionStatsUrl) {
         colors = PHP_VERSION_COLORS;
 
         var match,

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -40,6 +40,21 @@ parameters:
 			count: 1
 			path: src/Entity/Version.php
 
+		-
+			message: "#^Query error\\: Column \"audit_log\\.attributes\" expects value type string, got type array\\<string, mixed\\>$#"
+			count: 1
+			path: src/EventListener/PackageListener.php
+
+		-
+			message: "#^Query error\\: Column \"audit_log\\.datetime\" expects value type string, got type DateTimeImmutable$#"
+			count: 1
+			path: src/EventListener/PackageListener.php
+
+		-
+			message: "#^Query error\\: Column \"audit_log\\.id\" expects value type string, got type Symfony\\\\Component\\\\Uid\\\\Ulid$#"
+			count: 1
+			path: src/EventListener/PackageListener.php
+
 		-
 			message: "#^Method App\\\\Model\\\\FavoriteManager\\:\\:getFavoriteCount\\(\\) should return int\\<0, max\\> but returns int\\.$#"
 			count: 1

diff --git a/src/Controller/PackageController.php b/src/Controller/PackageController.php
@@ -564,6 +564,7 @@ public function viewPackageAction(Request $req, string $name, CsrfTokenManagerIn
 
         $version = null;
         $expandedVersion = null;
+        /** @var Version[] $versions */
         $versions = $package->getVersions()->toArray();
 
         usort($versions, Package::class.'::sortVersions');

diff --git a/templates/package/php_stats.html.twig b/templates/package/php_stats.html.twig
@@ -60,9 +60,8 @@
         (function () {
             var average = {{ average|json_encode|raw }};
             var date = {{ date|json_encode|raw }};
-            var versions = {{ versions|json_encode|raw }};
 
-            initPhpStats(average, date, versions, {{ path('version_php_stats', {name: package.name, version: '_VERSION_', type: 'effective'})|replace({effective: '_TYPE_'})|json_encode|raw }});
+            initPhpStats(average, date, {{ path('version_php_stats', {name: package.name, version: '_VERSION_', type: 'effective'})|replace({effective: '_TYPE_'})|json_encode|raw }});
         }());
     </script>
 {% endblock %}
diff --git a/templates/package/stats.html.twig b/templates/package/stats.html.twig
@@ -94,9 +94,8 @@
         (function () {
             var average = {{ average|json_encode|raw }};
             var date = {{ date|json_encode|raw }};
-            var versions = {{ versions|json_encode|raw }};
 
-            initPackageStats(average, date, versions, {{ path('package_stats', {name: package.name})|json_encode|raw }}, {{ path('version_stats', {name: package.name, version: '_VERSION_'})|json_encode|raw }});
+            initPackageStats(average, date, {{ path('package_stats', {name: package.name})|json_encode|raw }}, {{ path('version_stats', {name: package.name, version: '_VERSION_'})|json_encode|raw }});
         }());
     </script>
 {% endblock %}
diff --git a/tests/Package/SymlinkDumperTest.php b/tests/Package/SymlinkDumperTest.php
@@ -86,7 +86,6 @@ public static function getTestGetTargetListingBlocks(): array
     private static function invoke($object, $method): mixed
     {
         $refl = new \ReflectionMethod($object, $method);
-        $refl->setAccessible(true);
 
         $args = func_get_args();
         array_shift($args); // object

diff --git a/tests/Package/UpdaterTest.php b/tests/Package/UpdaterTest.php
@@ -52,7 +52,6 @@ protected function setUp(): void
         $this->package->setName('test/pkg');
         $this->package->setRepository('https://example.com/test/pkg');
         $reflProp = new \ReflectionProperty(Package::class, 'id');
-        $reflProp->setAccessible(true);
         $reflProp->setValue($this->package, 1);
 
         $this->ioMock = $this->createMock(NullIO::class);
@@ -73,7 +72,6 @@ protected function setUp(): void
         }));
         $emMock->expects($this->any())->method('persist')->will($this->returnCallback(static function ($object) {
             if ($reflProperty = new \ReflectionProperty($object, 'id')) {
-                $reflProperty->setAccessible(true);
                 $reflProperty->setValue($object, random_int(0, 10000));
             }
         }));