Switching from PHP 8.1 to 8.2.

krulis-martin · krulis-martin · commit 056b2af251d6 · 2023-08-07T00:13:49.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1']
+        php: ['8.2']
     steps:
     - uses: actions/checkout@v2
     - name: Setup PHP with pecl and extensions
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1']
+        php: ['8.2']
     steps:
     - uses: actions/checkout@v2
     - name: Setup PHP with pecl and extensions
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1']
+        php: ['8.2']
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP with pecl and extensions
diff --git a/app/V1Module/presenters/WorkerFilesPresenter.php b/app/V1Module/presenters/WorkerFilesPresenter.php
@@ -106,7 +106,7 @@ public function actionDownloadSubmissionArchive(string $type, string $id)
                 );
             }
         }
-        $this->sendStorageFileResponse($file, "${type}_${id}.zip");
+        $this->sendStorageFileResponse($file, "{$type}_{$id}.zip");
     }
 
     /**
diff --git a/app/helpers/Emails/Notifications/Reviews/ReviewsEmailSender.php b/app/helpers/Emails/Notifications/Reviews/ReviewsEmailSender.php
@@ -118,7 +118,7 @@ private function createReviewNotification(
         $latte = EmailLatteFactory::latte();
         $template = EmailLocalizationHelper::getTemplate(
             $locale,
-            __DIR__ . "/review${notificationType}_{locale}.latte"
+            __DIR__ . "/review{$notificationType}_{locale}.latte"
         );
 
         $params = $this->prepareSolutionEmailParams($locale, $solution, $closed);
@@ -248,7 +248,7 @@ private function createCommentNotification(
         $latte = EmailLatteFactory::latte();
         $template = EmailLocalizationHelper::getTemplate(
             $locale,
-            __DIR__ . "/comment${notificationType}_{locale}.latte"
+            __DIR__ . "/comment{$notificationType}_{locale}.latte"
         );
 
         $params = $this->prepareSolutionEmailParams($locale, $solution);
diff --git a/app/helpers/ExerciseConfig/Pipeline/Box/Boxes/BisonCompilationBox.php b/app/helpers/ExerciseConfig/Pipeline/Box/Boxes/BisonCompilationBox.php
@@ -117,15 +117,15 @@ public function compile(CompilationParams $params): array
         if ($this->hasInputPortValue(self::$ARGS_PORT_KEY)) {
             $args = $this->getInputPortValue(self::$ARGS_PORT_KEY)->getValue();
         }
-        $args[] = "--defines=${inputBaseName}.hpp";
+        $args[] = "--defines={$inputBaseName}.hpp";
         $args[] = "-o";
-        $args[] = "${inputBaseName}.cpp";
+        $args[] = "{$inputBaseName}.cpp";
         $args[] = $inputFile;
         $task->setCommandArguments($args);
 
         // Set output names correctly and create task that will check their existence
         $output = $this->getOutputPortValue(self::$OUTPUT_FILES_PORT_KEY);
-        $output->setValue(["${inputBaseName}.cpp", "${inputBaseName}.hpp"]);
+        $output->setValue(["{$inputBaseName}.cpp", "{$inputBaseName}.hpp"]);
         $exists = $this->compileExistsTask($output->getDirPrefixedValue(ConfigParams::$SOURCE_DIR));
 
         return [$task, $exists];
diff --git a/app/helpers/FileStorageManager.php b/app/helpers/FileStorageManager.php
@@ -119,7 +119,7 @@ private function getUploadedPartialFilePath(UploadedPartialFile $file, int $chun
         $dir = self::PARTIAL_UPLOADS;
         $id = $file->getId();
         $name = $file->getName();
-        return "$dir/${id}_${name}_$chunk";
+        return "$dir/{$id}_{$name}_$chunk";
     }
 
     /**
@@ -185,7 +185,7 @@ private function getUploadedFilePath(UploadedFile $file): string
         $dir = self::UPLOADS;
         $id = $file->getId();
         $name = $file->getName();
-        return "$dir/${id}_$name";
+        return "$dir/{$id}_$name";
     }
 
     /**
@@ -359,7 +359,7 @@ private function getAttachmentFilePath(AttachmentFile $file): string
         $userDir = $user ? "user_$user" : "_system"; // files without user are treated as sys. files
         $id = $file->getId();
         $name = $file->getName();
-        return "$dir/$userDir/${id}_${name}";
+        return "$dir/$userDir/{$id}_{$name}";
     }
 
     /**
@@ -406,7 +406,7 @@ private function getJobConfigPath(Submission $submission): string
         $dir = self::augmentDir(self::JOB_CONFIGS, $submission);
         $type = $submission::JOB_TYPE;
         $id = $submission->getId();
-        return "$dir/${id}_${type}.yml";
+        return "$dir/{$id}_{$type}.yml";
     }
 
     /**
@@ -450,7 +450,7 @@ private function getSolutionArchivePath(Solution $solution): string
     {
         $dir = self::augmentDir(self::SOLUTIONS, $solution);
         $id = $solution->getId();
-        return "$dir/${id}.zip";
+        return "$dir/{$id}.zip";
     }
 
     /**
@@ -508,7 +508,7 @@ public function deleteSolutionArchive(Solution $solution): bool
      */
     private function getWorkerSubmissionArchivePath(string $type, string $id): string
     {
-        return self::WORKER_DOWNLOADS . "/${id}_${type}.zip";
+        return self::WORKER_DOWNLOADS . "/{$id}_{$type}.zip";
     }
 
     /**
@@ -562,7 +562,7 @@ public function createWorkerSubmissionArchive(Submission $submission): ?IImmutab
      */
     private function getWorkerUploadResultsArchivePath(string $type, string $submissionId): string
     {
-        return self::WORKER_UPLOADS . "/${submissionId}_${type}.zip";
+        return self::WORKER_UPLOADS . "/{$submissionId}_{$type}.zip";
     }
 
     /**
@@ -599,7 +599,7 @@ private function getResultsArchivePath(Submission $submission): string
         $dir = self::augmentDir(self::RESULTS, $submission);
         $type = $submission::JOB_TYPE;
         $id = $submission->getId();
-        return "$dir/${id}_${type}.zip";
+        return "$dir/{$id}_{$type}.zip";
     }
 
     /**
diff --git a/composer.json b/composer.json
@@ -22,11 +22,11 @@
     },
     "config": {
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.0"
         }
     },
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "ext-yaml": ">=2.0",
         "ext-json": ">=1.7",
         "ext-zip": ">=1.15",
diff --git a/composer.lock b/composer.lock
diff --git a/migrations/Version20200421000600.php b/migrations/Version20200421000600.php
@@ -35,7 +35,7 @@ private function isUniform($config)
             if (!isset($yaml['testWeights']) || !is_array($yaml['testWeights'])) {
                 return false;
             }
-            
+
             $lastValue = null;
             foreach ($yaml['testWeights'] as $value) {
                 if (!is_integer($value)) {
@@ -91,7 +91,7 @@ public function down(Schema $schema): void
                 // get list of tests so we can use it to construct config
                 $tests = $this->connection->executeQuery(
                     "SELECT et.name AS `name` FROM exercise_test AS et
-                    JOIN ${table}_exercise_test AS eet ON eet.exercise_test_id = et.id WHERE eet.${table}_id = :tid",
+                    JOIN {$table}_exercise_test AS eet ON eet.exercise_test_id = et.id WHERE eet.{$table}_id = :tid",
                     [ 'tid' => $config['tid'] ]
                 )->fetchFirstColumn();
 
diff --git a/tests/Presenters/UserCalendarsPresenter.phpt b/tests/Presenters/UserCalendarsPresenter.phpt
@@ -39,7 +39,6 @@ class TestUserCalendarsPresenter extends Tester\TestCase
     {
         global $container;
         $this->container = $container;
-        $this->em = PresenterTestHelper::getEntityManager($container);
         $this->assignments = $container->getByType(Assignments::class);
         $this->userCalendars = $container->getByType(UserCalendars::class);
     }
diff --git a/tests/Presenters/UsersPresenter.phpt b/tests/Presenters/UsersPresenter.phpt
@@ -46,7 +46,7 @@ class TestUsersPresenter extends Tester\TestCase
     protected $externalLogins;
 
     /** @var App\Helpers\AnonymizationHelper */
-    protected $annonymizationHelper;
+    protected $anonymizationHelper;
 
     /** @var  Nette\DI\Container */
     protected $container;
diff --git a/tests/Presenters/WorkerFilesPresenter.phpt b/tests/Presenters/WorkerFilesPresenter.phpt
@@ -46,13 +46,12 @@ class TestWorkerFilesPresenter extends Tester\TestCase
     {
         global $container;
         $this->container = $container;
-        $this->em = PresenterTestHelper::getEntityManager($container);
 
         // patch container, since we cannot create actual file storage manarer
         $fsName = current($this->container->findByType(FileStorageManager::class));
         $this->container->removeService($fsName);
         $this->container->addService($fsName, new FileStorageManager(
-            Mockery::mock(LocalFileStorage::class), 
+            Mockery::mock(LocalFileStorage::class),
             Mockery::mock(LocalHashFileStorage::class),
             Mockery::mock(TmpFilesHelper::class),
             ""
@@ -78,7 +77,6 @@ class TestWorkerFilesPresenter extends Tester\TestCase
         $this->httpRequestName = current($this->container->findByType(Nette\Http\Request::class));
         $this->originalHttpRequest = $this->container->getService($this->httpRequestName);
         $this->container->removeService($this->httpRequestName);
-
     }
 
     protected function setUp()
@@ -110,9 +108,12 @@ class TestWorkerFilesPresenter extends Tester\TestCase
             ]
         ]);
 
-        Assert::exception(function() {
-            $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-            ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']);
+        Assert::exception(function () {
+            $request = new \Nette\Application\Request(
+                $this->presenterPath,
+                'GET',
+                ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']
+            );
                 $response = $this->presenter->run($request);
         }, WrongCredentialsException::class, '');
     }
@@ -127,9 +128,12 @@ class TestWorkerFilesPresenter extends Tester\TestCase
             ]
         ]);
 
-        Assert::exception(function() {
-            $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-            ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']);
+        Assert::exception(function () {
+            $request = new \Nette\Application\Request(
+                $this->presenterPath,
+                'GET',
+                ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']
+            );
                 $response = $this->presenter->run($request);
         }, ForbiddenRequestException::class, 'Worker files interface is disabled in the configuration.');
     }
@@ -139,11 +143,14 @@ class TestWorkerFilesPresenter extends Tester\TestCase
         // mock file and storage
         $mockFileStorage = Mockery::mock(FileStorageManager::class);
         $mockFileStorage->shouldReceive("getSupplementaryFileByHash")
-            ->withArgs(['a123'])->andReturn( Mockery::mock(LocalImmutableFile::class) )->once();
+            ->withArgs(['a123'])->andReturn(Mockery::mock(LocalImmutableFile::class))->once();
         $this->presenter->fileStorage = $mockFileStorage;
 
-        $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-            ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']);
+        $request = new \Nette\Application\Request(
+            $this->presenterPath,
+            'GET',
+            ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']
+        );
         $response = $this->presenter->run($request);
 
         Assert::type(StorageFileResponse::class, $response);
@@ -157,9 +164,12 @@ class TestWorkerFilesPresenter extends Tester\TestCase
             ->withArgs(['a123'])->andReturn(null)->once();
         $this->presenter->fileStorage = $mockFileStorage;
 
-        Assert::exception(function() {
-            $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-            ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']);
+        Assert::exception(function () {
+            $request = new \Nette\Application\Request(
+                $this->presenterPath,
+                'GET',
+                ['action' => 'downloadSupplementaryFile', 'hash' => 'a123']
+            );
                 $response = $this->presenter->run($request);
         }, NotFoundException::class, 'Not Found - Supplementary file not found in the storage');
     }
@@ -169,11 +179,14 @@ class TestWorkerFilesPresenter extends Tester\TestCase
         // mock file and storage
         $mockFileStorage = Mockery::mock(FileStorageManager::class);
         $mockFileStorage->shouldReceive("getWorkerSubmissionArchive")
-            ->withArgs(['student', 'id1'])->andReturn( Mockery::mock(LocalImmutableFile::class) )->once();
+            ->withArgs(['student', 'id1'])->andReturn(Mockery::mock(LocalImmutableFile::class))->once();
         $this->presenter->fileStorage = $mockFileStorage;
 
-        $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-            ['action' => 'downloadSubmissionArchive', 'type' => 'student', 'id' => 'id1']);
+        $request = new \Nette\Application\Request(
+            $this->presenterPath,
+            'GET',
+            ['action' => 'downloadSubmissionArchive', 'type' => 'student', 'id' => 'id1']
+        );
         $response = $this->presenter->run($request);
 
         Assert::type(StorageFileResponse::class, $response);
@@ -190,11 +203,14 @@ class TestWorkerFilesPresenter extends Tester\TestCase
         $mockFileStorage->shouldReceive("getWorkerSubmissionArchive")
             ->withArgs(['student', 'id1'])->andReturn(null)->once();
         $mockFileStorage->shouldReceive("createWorkerSubmissionArchive")
-            ->withArgs([$submission])->andReturn( Mockery::mock(LocalImmutableFile::class) )->once();
+            ->withArgs([$submission])->andReturn(Mockery::mock(LocalImmutableFile::class))->once();
         $this->presenter->fileStorage = $mockFileStorage;
 
-        $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-            ['action' => 'downloadSubmissionArchive', 'type' => 'student', 'id' => 'id1']);
+        $request = new \Nette\Application\Request(
+            $this->presenterPath,
+            'GET',
+            ['action' => 'downloadSubmissionArchive', 'type' => 'student', 'id' => 'id1']
+        );
         $response = $this->presenter->run($request);
 
         Assert::type(StorageFileResponse::class, $response);
@@ -214,9 +230,12 @@ class TestWorkerFilesPresenter extends Tester\TestCase
             ->withArgs([$submission])->andReturn(null)->once();
         $this->presenter->fileStorage = $mockFileStorage;
 
-        Assert::exception(function() {
-            $request = new \Nette\Application\Request($this->presenterPath, 'GET',
-                ['action' => 'downloadSubmissionArchive', 'type' => 'student', 'id' => 'id1']);
+        Assert::exception(function () {
+            $request = new \Nette\Application\Request(
+                $this->presenterPath,
+                'GET',
+                ['action' => 'downloadSubmissionArchive', 'type' => 'student', 'id' => 'id1']
+            );
             $response = $this->presenter->run($request);
         }, NotFoundException::class, 'Not Found - Unable to create worker submission archive (some ingredients may be missing)');
     }
@@ -229,7 +248,9 @@ class TestWorkerFilesPresenter extends Tester\TestCase
         $this->presenter->fileStorage = $mockFileStorage;
 
         $payload = PresenterTestHelper::performPresenterRequest(
-            $this->presenter, $this->presenterPath, 'PUT',
+            $this->presenter,
+            $this->presenterPath,
+            'PUT',
             ['action' => 'uploadResultsFile', 'type' => 'student', 'id' => 'id1']
         );
         Assert::equal("OK", $payload);

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function actionDownloadSubmissionArchive(string $type, string $id)`
`106`	`106`	`);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`- $this->sendStorageFileResponse($file, "${type}_${id}.zip");`
	`109`	`+ $this->sendStorageFileResponse($file, "{$type}_{$id}.zip");`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private function getUploadedPartialFilePath(UploadedPartialFile $file, int $chun`
`119`	`119`	`$dir = self::PARTIAL_UPLOADS;`
`120`	`120`	`$id = $file->getId();`
`121`	`121`	`$name = $file->getName();`
`122`		`- return "$dir/${id}_${name}_$chunk";`
	`122`	`+ return "$dir/{$id}_{$name}_$chunk";`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/**`
`@@ -185,7 +185,7 @@ private function getUploadedFilePath(UploadedFile $file): string`
`185`	`185`	`$dir = self::UPLOADS;`
`186`	`186`	`$id = $file->getId();`
`187`	`187`	`$name = $file->getName();`
`188`		`- return "$dir/${id}_$name";`
	`188`	`+ return "$dir/{$id}_$name";`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/**`
`@@ -359,7 +359,7 @@ private function getAttachmentFilePath(AttachmentFile $file): string`
`359`	`359`	`$userDir = $user ? "user_$user" : "_system"; // files without user are treated as sys. files`
`360`	`360`	`$id = $file->getId();`
`361`	`361`	`$name = $file->getName();`
`362`		`- return "$dir/$userDir/${id}_${name}";`
	`362`	`+ return "$dir/$userDir/{$id}_{$name}";`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`/**`
`@@ -406,7 +406,7 @@ private function getJobConfigPath(Submission $submission): string`
`406`	`406`	`$dir = self::augmentDir(self::JOB_CONFIGS, $submission);`
`407`	`407`	`$type = $submission::JOB_TYPE;`
`408`	`408`	`$id = $submission->getId();`
`409`		`- return "$dir/${id}_${type}.yml";`
	`409`	`+ return "$dir/{$id}_{$type}.yml";`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`/**`
`@@ -450,7 +450,7 @@ private function getSolutionArchivePath(Solution $solution): string`
`450`	`450`	`{`
`451`	`451`	`$dir = self::augmentDir(self::SOLUTIONS, $solution);`
`452`	`452`	`$id = $solution->getId();`
`453`		`- return "$dir/${id}.zip";`
	`453`	`+ return "$dir/{$id}.zip";`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`/**`
`@@ -508,7 +508,7 @@ public function deleteSolutionArchive(Solution $solution): bool`
`508`	`508`	`*/`
`509`	`509`	`private function getWorkerSubmissionArchivePath(string $type, string $id): string`
`510`	`510`	`{`
`511`		`- return self::WORKER_DOWNLOADS . "/${id}_${type}.zip";`
	`511`	`+ return self::WORKER_DOWNLOADS . "/{$id}_{$type}.zip";`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`/**`
`@@ -562,7 +562,7 @@ public function createWorkerSubmissionArchive(Submission $submission): ?IImmutab`
`562`	`562`	`*/`
`563`	`563`	`private function getWorkerUploadResultsArchivePath(string $type, string $submissionId): string`
`564`	`564`	`{`
`565`		`- return self::WORKER_UPLOADS . "/${submissionId}_${type}.zip";`
	`565`	`+ return self::WORKER_UPLOADS . "/{$submissionId}_{$type}.zip";`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`/**`
`@@ -599,7 +599,7 @@ private function getResultsArchivePath(Submission $submission): string`
`599`	`599`	`$dir = self::augmentDir(self::RESULTS, $submission);`
`600`	`600`	`$type = $submission::JOB_TYPE;`
`601`	`601`	`$id = $submission->getId();`
`602`		`- return "$dir/${id}_${type}.zip";`
	`602`	`+ return "$dir/{$id}_{$type}.zip";`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ class TestUserCalendarsPresenter extends Tester\TestCase`
`39`	`39`	`{`
`40`	`40`	`global $container;`
`41`	`41`	`$this->container = $container;`
`42`		`- $this->em = PresenterTestHelper::getEntityManager($container);`
`43`	`42`	`$this->assignments = $container->getByType(Assignments::class);`
`44`	`43`	`$this->userCalendars = $container->getByType(UserCalendars::class);`
`45`	`44`	`}`