From 8ee7c5d03e6cde3d2f6127b11c4528fd3c2b0cf1 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 16 Mar 2022 18:47:28 +0100 Subject: [PATCH 01/10] UG -> GmbH --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index c25ea3a..a835996 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019 Aternos UG (haftungsbeschränkt) +Copyright (c) 2019 Aternos GmbH (haftungsbeschränkt) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. From 7e2cd39c51789bf56e3f64772a634d3b3232935e Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 16 Mar 2022 18:51:23 +0100 Subject: [PATCH 02/10] UG -> GmbH pt.2 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index a835996..0fa3b70 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019 Aternos GmbH (haftungsbeschränkt) +Copyright (c) 2019 Aternos GmbH Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From ac4fcc4d4cb2e3307d8a88ee5bec112f63a136e9 Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 14:02:56 +0100 Subject: [PATCH 03/10] Add namespace to tests --- composer.json | 6 ++++++ test/src/Analysis/TestInformation.php | 2 ++ test/src/Analysis/TestInsight.php | 2 ++ test/src/Analysis/TestPatternInformation.php | 2 ++ test/src/Analysis/TestPatternProblem.php | 2 ++ test/src/Analysis/TestProblem.php | 2 ++ test/src/Analysis/TestSolution.php | 2 ++ test/src/Log/TestAlwaysDetectableLog.php | 2 ++ test/src/Log/TestLessDetectableLog.php | 2 ++ test/src/Log/TestMoreDetectableLog.php | 2 ++ test/src/Log/TestNeverDetectableLog.php | 2 ++ test/src/Log/TestPatternLog.php | 5 +++-- test/src/Printer/TestModification.php | 2 ++ test/tests/Analyser/PatternAnalyserTest.php | 7 ++++--- test/tests/Analysis/AnalysisTest.php | 7 ++++--- test/tests/Analysis/InformationTest.php | 5 +++-- test/tests/Analysis/ProblemTest.php | 5 +++-- test/tests/Detector/DetectiveTest.php | 9 +++++---- test/tests/Detector/LinePatternDetectorTest.php | 1 + test/tests/Detector/SinglePatternDetectorTest.php | 1 + .../tests/Detector/WeightedSinglePatternDetectorTest.php | 2 ++ test/tests/Log/EntryTest.php | 2 ++ test/tests/Log/File/PathLogFileTest.php | 1 + test/tests/Log/File/StreamLogFileTest.php | 1 + test/tests/Log/File/StringLogFileTest.php | 1 + test/tests/Log/LineTest.php | 2 ++ test/tests/Log/LogTest.php | 2 ++ test/tests/Parser/DefaultParserTest.php | 2 ++ test/tests/Parser/PatternParserTest.php | 3 ++- test/tests/Printer/DefaultPrinterTest.php | 1 + test/tests/Printer/ModifiableDefaultPrinterTest.php | 3 ++- test/tests/Printer/PatternModificationTest.php | 2 +- 32 files changed, 71 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index c7c9dfe..9a5343c 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,12 @@ "Aternos\\Codex\\": "src/" } }, + "autoload-dev": { + "psr-4": { + "Aternos\\Codex\\Test\\Src\\": "test/src/", + "Aternos\\Codex\\Test\\Tests\\": "test/tests/" + } + }, "require-dev": { "phpunit/phpunit": "^9.5" }, diff --git a/test/src/Analysis/TestInformation.php b/test/src/Analysis/TestInformation.php index cec1d23..917dd98 100644 --- a/test/src/Analysis/TestInformation.php +++ b/test/src/Analysis/TestInformation.php @@ -1,5 +1,7 @@ setValue($value);; + $informationA->setValue($value); $informationB = new TestInformation(); $informationB->setValue($value); diff --git a/test/tests/Analysis/ProblemTest.php b/test/tests/Analysis/ProblemTest.php index db5253b..94e6d43 100644 --- a/test/tests/Analysis/ProblemTest.php +++ b/test/tests/Analysis/ProblemTest.php @@ -1,8 +1,9 @@ Date: Mon, 21 Mar 2022 14:13:08 +0100 Subject: [PATCH 04/10] Add return type hints to test methods --- test/tests/Analyser/PatternAnalyserTest.php | 4 ++-- test/tests/Analysis/AnalysisTest.php | 8 ++++---- test/tests/Analysis/InformationTest.php | 8 ++++---- test/tests/Analysis/ProblemTest.php | 4 ++-- test/tests/Detector/DetectiveTest.php | 4 ++-- test/tests/Detector/LinePatternDetectorTest.php | 2 +- test/tests/Detector/SinglePatternDetectorTest.php | 2 +- test/tests/Detector/WeightedSinglePatternDetectorTest.php | 2 +- test/tests/Log/EntryTest.php | 8 ++++---- test/tests/Log/File/PathLogFileTest.php | 2 +- test/tests/Log/File/StreamLogFileTest.php | 2 +- test/tests/Log/File/StringLogFileTest.php | 2 +- test/tests/Log/LineTest.php | 6 +++--- test/tests/Log/LogTest.php | 4 ++-- test/tests/Parser/DefaultParserTest.php | 4 ++-- test/tests/Parser/PatternParserTest.php | 4 ++-- test/tests/Printer/DefaultPrinterTest.php | 4 ++-- test/tests/Printer/ModifiableDefaultPrinterTest.php | 4 ++-- test/tests/Printer/PatternModificationTest.php | 2 +- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/test/tests/Analyser/PatternAnalyserTest.php b/test/tests/Analyser/PatternAnalyserTest.php index f16749f..ef7bf0b 100644 --- a/test/tests/Analyser/PatternAnalyserTest.php +++ b/test/tests/Analyser/PatternAnalyserTest.php @@ -16,7 +16,7 @@ class PatternAnalyserTest extends TestCase /** * @return Analysis */ - protected function getExpectedAnalysis() + protected function getExpectedAnalysis(): Analysis { $analysis = (new Analysis()) ->addInsight((new TestPatternProblem()) @@ -56,7 +56,7 @@ protected function getExpectedAnalysis() return $analysis; } - public function testAnalyse() + public function testAnalyse(): void { $logFile = new PathLogFile(__DIR__ . '/../../data/problem.log'); $log = (new TestPatternLog())->setLogFile($logFile); diff --git a/test/tests/Analysis/AnalysisTest.php b/test/tests/Analysis/AnalysisTest.php index 88ce29a..ee94c5f 100644 --- a/test/tests/Analysis/AnalysisTest.php +++ b/test/tests/Analysis/AnalysisTest.php @@ -10,7 +10,7 @@ class AnalysisTest extends TestCase { - public function testSetGetInsights() + public function testSetGetInsights(): void { $analysis = new Analysis(); $insight = new TestInsight(); @@ -18,7 +18,7 @@ public function testSetGetInsights() $this->assertSame([$insight], $analysis->getInsights()); } - public function testAddInsight() + public function testAddInsight(): void { $analysis = new Analysis(); $insight = new TestInsight(); @@ -26,7 +26,7 @@ public function testAddInsight() $this->assertSame([$insight], $analysis->getInsights()); } - public function testGetProblems() + public function testGetProblems(): void { $analysis = new Analysis(); $problem = new TestProblem(); @@ -38,7 +38,7 @@ public function testGetProblems() $this->assertEquals([$problem], $analysis->getProblems()); } - public function testGetInformation() + public function testGetInformation(): void { $analysis = new Analysis(); $problem = new TestProblem(); diff --git a/test/tests/Analysis/InformationTest.php b/test/tests/Analysis/InformationTest.php index 50eeeea..618d0b5 100644 --- a/test/tests/Analysis/InformationTest.php +++ b/test/tests/Analysis/InformationTest.php @@ -8,7 +8,7 @@ class InformationTest extends TestCase { - public function testSetGetValue() + public function testSetGetValue(): void { $value = uniqid(); $information = new TestInformation(); @@ -16,12 +16,12 @@ public function testSetGetValue() $this->assertEquals($value, $information->getValue()); } - public function testGetLabel() + public function testGetLabel(): void { $this->assertEquals("Label", (new TestInformation())->getLabel()); } - public function testGetMessage() + public function testGetMessage(): void { $value = uniqid(); $information = new TestInformation(); @@ -30,7 +30,7 @@ public function testGetMessage() $this->assertEquals("Label: " . $value, (string)$information); } - public function testIsEqual() + public function testIsEqual(): void { $value = uniqid(); $informationA = new TestInformation(); diff --git a/test/tests/Analysis/ProblemTest.php b/test/tests/Analysis/ProblemTest.php index 94e6d43..2589a87 100644 --- a/test/tests/Analysis/ProblemTest.php +++ b/test/tests/Analysis/ProblemTest.php @@ -9,7 +9,7 @@ class ProblemTest extends TestCase { - public function testSetGetSolutions() + public function testSetGetSolutions(): void { $problem = new TestProblem(); $solution = new TestSolution(); @@ -17,7 +17,7 @@ public function testSetGetSolutions() $this->assertEquals([$solution], $problem->getSolutions()); } - public function testAddSolutions() + public function testAddSolutions(): void { $problem = new TestProblem(); $solution = new TestSolution(); diff --git a/test/tests/Detector/DetectiveTest.php b/test/tests/Detector/DetectiveTest.php index e74d49a..47baa02 100644 --- a/test/tests/Detector/DetectiveTest.php +++ b/test/tests/Detector/DetectiveTest.php @@ -16,7 +16,7 @@ class DetectiveTest extends TestCase * @param array $possibleLogClasses * @return Detective */ - protected function getDetective(array $possibleLogClasses) + protected function getDetective(array $possibleLogClasses): Detective { $detective = new Detective(); $detective->setLogFile(new \Aternos\Codex\Log\File\PathLogFile(__DIR__ . '/../../data/simple.log')); @@ -24,7 +24,7 @@ protected function getDetective(array $possibleLogClasses) return $detective; } - public function testDetect() + public function testDetect(): void { $this->assertEquals(TestAlwaysDetectableLog::class, get_class($this->getDetective([ diff --git a/test/tests/Detector/LinePatternDetectorTest.php b/test/tests/Detector/LinePatternDetectorTest.php index f2274c2..a222b68 100644 --- a/test/tests/Detector/LinePatternDetectorTest.php +++ b/test/tests/Detector/LinePatternDetectorTest.php @@ -7,7 +7,7 @@ class LinePatternDetectorTest extends TestCase { - public function testDetect() + public function testDetect(): void { $this->assertEquals(5 / 7, (new LinePatternDetector()) ->setLogFile(new \Aternos\Codex\Log\File\PathLogFile(__DIR__ . '/../../data/simple.log')) diff --git a/test/tests/Detector/SinglePatternDetectorTest.php b/test/tests/Detector/SinglePatternDetectorTest.php index 99c0142..8124426 100644 --- a/test/tests/Detector/SinglePatternDetectorTest.php +++ b/test/tests/Detector/SinglePatternDetectorTest.php @@ -8,7 +8,7 @@ class SinglePatternDetectorTest extends TestCase { - public function testDetect() + public function testDetect(): void { $this->assertTrue((new SinglePatternDetector()) ->setLogFile(new StringLogFile("You can detect this.")) diff --git a/test/tests/Detector/WeightedSinglePatternDetectorTest.php b/test/tests/Detector/WeightedSinglePatternDetectorTest.php index 6ad5158..43c0d01 100644 --- a/test/tests/Detector/WeightedSinglePatternDetectorTest.php +++ b/test/tests/Detector/WeightedSinglePatternDetectorTest.php @@ -8,7 +8,7 @@ class WeightedSinglePatternDetectorTest extends TestCase { - public function testDetect() + public function testDetect(): void { $this->assertEquals(1, (new WeightedSinglePatternDetector()) ->setLogFile(new \Aternos\Codex\Log\File\PathLogFile(__DIR__ . '/../../data/simple.log')) diff --git a/test/tests/Log/EntryTest.php b/test/tests/Log/EntryTest.php index eeef84a..9609022 100644 --- a/test/tests/Log/EntryTest.php +++ b/test/tests/Log/EntryTest.php @@ -9,7 +9,7 @@ class EntryTest extends TestCase { - public function testAddLine() + public function testAddLine(): void { $entry = new Entry(); $line = (new Line())->setText(uniqid()); @@ -17,7 +17,7 @@ public function testAddLine() $this->assertEquals([$line], $entry->getLines()); } - public function testSetGetLines() + public function testSetGetLines(): void { $entry = new Entry(); $line = (new Line())->setText(uniqid()); @@ -25,7 +25,7 @@ public function testSetGetLines() $this->assertEquals([$line], $entry->getLines()); } - public function testSetGetLevel() + public function testSetGetLevel(): void { $entry = new Entry(); $level = rand(0, 100); @@ -33,7 +33,7 @@ public function testSetGetLevel() $this->assertEquals($level, $entry->getLevel()); } - public function testSetGetTime() + public function testSetGetTime(): void { $entry = new Entry(); $time = time(); diff --git a/test/tests/Log/File/PathLogFileTest.php b/test/tests/Log/File/PathLogFileTest.php index b853ffd..b832a07 100644 --- a/test/tests/Log/File/PathLogFileTest.php +++ b/test/tests/Log/File/PathLogFileTest.php @@ -7,7 +7,7 @@ class PathLogFileTest extends TestCase { - public function testGetContent() + public function testGetContent(): void { $path = __DIR__ . "/../../../data/simple.log"; $logFile = new PathLogFile($path); diff --git a/test/tests/Log/File/StreamLogFileTest.php b/test/tests/Log/File/StreamLogFileTest.php index 33464bd..40c9fa4 100644 --- a/test/tests/Log/File/StreamLogFileTest.php +++ b/test/tests/Log/File/StreamLogFileTest.php @@ -7,7 +7,7 @@ class StreamLogFileTest extends TestCase { - public function testGetContent() + public function testGetContent(): void { $path = __DIR__ . "/../../../data/simple.log"; $streamResource = fopen($path, 'r'); diff --git a/test/tests/Log/File/StringLogFileTest.php b/test/tests/Log/File/StringLogFileTest.php index ffbb290..2e31b20 100644 --- a/test/tests/Log/File/StringLogFileTest.php +++ b/test/tests/Log/File/StringLogFileTest.php @@ -7,7 +7,7 @@ class StringLogFileTest extends TestCase { - public function testGetContent() + public function testGetContent(): void { $content = uniqid(); $logFile = new StringLogFile($content); diff --git a/test/tests/Log/LineTest.php b/test/tests/Log/LineTest.php index b698d29..1001664 100644 --- a/test/tests/Log/LineTest.php +++ b/test/tests/Log/LineTest.php @@ -7,7 +7,7 @@ class LineTest extends TestCase { - public function testSetGetText() + public function testSetGetText(): void { $text = uniqid(); $line = new Line(); @@ -15,7 +15,7 @@ public function testSetGetText() $this->assertEquals($text, $line->getText()); } - public function testSetGetNumber() + public function testSetGetNumber(): void { $number = rand(0, 100); $line = new Line(); @@ -23,7 +23,7 @@ public function testSetGetNumber() $this->assertEquals($number, $line->getNumber()); } - public function test__toString() + public function test__toString(): void { $text = uniqid(); $line = new Line(); diff --git a/test/tests/Log/LogTest.php b/test/tests/Log/LogTest.php index fd2279e..e04109f 100644 --- a/test/tests/Log/LogTest.php +++ b/test/tests/Log/LogTest.php @@ -8,7 +8,7 @@ class LogTest extends TestCase { - public function testAddEntry() + public function testAddEntry(): void { $log = new Log(); $entry = (new Entry())->setLevel(rand(0, 100)); @@ -16,7 +16,7 @@ public function testAddEntry() $this->assertEquals([$entry], $log->getEntries()); } - public function testSetGetEntries() + public function testSetGetEntries(): void { $log = new Log(); $entry = (new Entry())->setLevel(rand(0, 100)); diff --git a/test/tests/Parser/DefaultParserTest.php b/test/tests/Parser/DefaultParserTest.php index 169cf7c..bbada50 100644 --- a/test/tests/Parser/DefaultParserTest.php +++ b/test/tests/Parser/DefaultParserTest.php @@ -15,7 +15,7 @@ class DefaultParserTest extends TestCase * * @return Log */ - protected function getSimpleExpectedLog() + protected function getSimpleExpectedLog(): Log { return (new Log()) ->setLogFile(new PathLogFile(__DIR__ . '/../../data/simple.log')) @@ -36,7 +36,7 @@ protected function getSimpleExpectedLog() } - public function testParse() + public function testParse(): void { $logFile = new PathLogFile(__DIR__ . '/../../data/simple.log'); $log = (new Log())->setLogFile($logFile); diff --git a/test/tests/Parser/PatternParserTest.php b/test/tests/Parser/PatternParserTest.php index 337da42..c0c61a6 100644 --- a/test/tests/Parser/PatternParserTest.php +++ b/test/tests/Parser/PatternParserTest.php @@ -16,7 +16,7 @@ class PatternParserTest extends TestCase * * @return Log */ - protected function getSimpleExpectedLog() + protected function getSimpleExpectedLog(): Log { return (new TestPatternLog()) ->setLogFile(new PathLogFile(__DIR__ . '/../../data/simple.log')) @@ -35,7 +35,7 @@ protected function getSimpleExpectedLog() } - public function testParse() + public function testParse(): void { $logFile = new PathLogFile(__DIR__ . '/../../data/simple.log'); $log = (new TestPatternLog())->setLogFile($logFile); diff --git a/test/tests/Printer/DefaultPrinterTest.php b/test/tests/Printer/DefaultPrinterTest.php index 341bb6c..ce9ff9e 100644 --- a/test/tests/Printer/DefaultPrinterTest.php +++ b/test/tests/Printer/DefaultPrinterTest.php @@ -11,7 +11,7 @@ class DefaultPrinterTest extends TestCase { - public function testPrint() + public function testPrint(): void { $logFile = new PathLogFile(__DIR__ . "/../../data/simple.log"); $log = new Log(); @@ -23,7 +23,7 @@ public function testPrint() $this->assertEquals($logFile->getContent(), trim($printer->print())); } - public function testPrintEntry() + public function testPrintEntry(): void { $text = uniqid(); $entry = (new Entry())->addLine((new Line())->setText($text)); diff --git a/test/tests/Printer/ModifiableDefaultPrinterTest.php b/test/tests/Printer/ModifiableDefaultPrinterTest.php index 8a9d9a0..e9d63ab 100644 --- a/test/tests/Printer/ModifiableDefaultPrinterTest.php +++ b/test/tests/Printer/ModifiableDefaultPrinterTest.php @@ -13,7 +13,7 @@ class ModifiableDefaultPrinterTest extends TestCase { - public function testPrint() + public function testPrint(): void { $logFile = new StringLogFile("This is foo!"); $log = new Log(); @@ -26,7 +26,7 @@ public function testPrint() $this->assertEquals("This is bar!", trim($printer->print())); } - public function testPrintEntry() + public function testPrintEntry(): void { $entry = (new Entry())->addLine((new Line())->setText("This is foo!")); diff --git a/test/tests/Printer/PatternModificationTest.php b/test/tests/Printer/PatternModificationTest.php index 6387abb..480732e 100644 --- a/test/tests/Printer/PatternModificationTest.php +++ b/test/tests/Printer/PatternModificationTest.php @@ -10,7 +10,7 @@ class PatternModificationTest extends TestCase { - public function testPrint() + public function testPrint(): void { $logFile = new StringLogFile("This is foo!"); $log = new Log(); From d51fb8b15a56590435722c3e32452fedb38cb023 Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 14:34:24 +0100 Subject: [PATCH 05/10] Migrate file content checks to newer phpunit assertions --- test/tests/Log/File/PathLogFileTest.php | 2 +- test/tests/Log/File/StreamLogFileTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tests/Log/File/PathLogFileTest.php b/test/tests/Log/File/PathLogFileTest.php index b832a07..acbd00a 100644 --- a/test/tests/Log/File/PathLogFileTest.php +++ b/test/tests/Log/File/PathLogFileTest.php @@ -12,6 +12,6 @@ public function testGetContent(): void $path = __DIR__ . "/../../../data/simple.log"; $logFile = new PathLogFile($path); - $this->assertEquals(file_get_contents($path), $logFile->getContent()); + $this->assertStringEqualsFile($path, $logFile->getContent()); } } diff --git a/test/tests/Log/File/StreamLogFileTest.php b/test/tests/Log/File/StreamLogFileTest.php index 40c9fa4..ea5b0d5 100644 --- a/test/tests/Log/File/StreamLogFileTest.php +++ b/test/tests/Log/File/StreamLogFileTest.php @@ -13,6 +13,6 @@ public function testGetContent(): void $streamResource = fopen($path, 'r'); $logFile = new StreamLogFile($streamResource); - $this->assertEquals(file_get_contents($path), $logFile->getContent()); + $this->assertStringEqualsFile($path, $logFile->getContent()); } } From 19fcfc6231fc13cc55b1b4158162cfe8364635f3 Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 14:50:16 +0100 Subject: [PATCH 06/10] Create phpunit.xml --- phpunit.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 phpunit.xml diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..aa79018 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,14 @@ + + + + + test/tests/ + + + + + + src + + + From 44e690f1d2a19322e1720588abc653b0f4defc93 Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 14:51:08 +0100 Subject: [PATCH 07/10] Add .phpunit.result.cache to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 331c58f..24265e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -vendor \ No newline at end of file +vendor +.phpunit.result.cache From e7205059f76717a60a51f1add8cb917fac92a9aa Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 15:30:17 +0100 Subject: [PATCH 08/10] Update composer.json to support php ^7.4 or ^8.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9a5343c..f2f1430 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=7.1.0" + "php": "^7.4 || ^8.0", }, "autoload": { "psr-4": { From a9c368c59dd2f359e806a52e7c231f94efad2633 Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 15:32:04 +0100 Subject: [PATCH 09/10] Update composer lock to support php ^7.4 or ^8.0 --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index f2f1430..a9cab4d 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^7.4 || ^8.0" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index e6067bd..927dd67 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "74820b329a7a97acd34478a8d58399be", + "content-hash": "5e63faed82b1cbd82e78717b39279890", "packages": [], "packages-dev": [ { @@ -1944,12 +1944,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2107,7 +2107,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.1.0" + "php": "^7.4 || ^8.0" }, "platform-dev": [], "plugin-api-version": "2.2.0" From 1fb34449be80e883d62ecf68e84eb3786c97888e Mon Sep 17 00:00:00 2001 From: Paul Vogel Date: Mon, 21 Mar 2022 15:48:42 +0100 Subject: [PATCH 10/10] Use php >= 7.4 syntax in composer json --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a9cab4d..726a2a2 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0" + "php": ">=7.4" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 927dd67..41cb8c9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5e63faed82b1cbd82e78717b39279890", + "content-hash": "1f391b5e23d3c756bdf9e45e81248e56", "packages": [], "packages-dev": [ { @@ -2107,7 +2107,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ^8.0" + "php": ">=7.4" }, "platform-dev": [], "plugin-api-version": "2.2.0"