0.x support 8.1 (#425)

Co-authored-by: Alies Lapatsin <[email protected]>

.github/workflows/ci.yaml

@@ -12,13 +12,9 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.1"
-          - "7.2"
-          - "7.3"
           - "7.4"
-          # I am to lazy to fix the CI now, because we will update PHPUnit and drop some PHP versions later,
-          # then this version will be activate again and everything should work...
-          # - "8.0"
+          - "8.0"
+          - "8.1"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v3"

.gitignore

@@ -1,3 +1,4 @@
 /.php_cs.cache
+.phpunit.result.cache
 /composer.lock
 /vendor

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Added
+- Support PHP 8.1
+### Changed
+- Use PHPUnit v9.5
+### Removed
+- Support for EOL PHP versions (7.1, 7.2, 7.3)
+
 ## [0.16.1]
 ### Added
 - Support PHP 8.0 [#194](https://github.com/markuspoerschke/iCal/pull/194)

composer.json

@@ -32,13 +32,13 @@
         }
     },
     "require": {
-        "php": ">=7.1 || ~8.0.0"
+        "php": ">=7.4"
     },
     "suggest": {
         "ext-mbstring" : "Massive performance enhancement of line folding"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.5"
     },
     "scripts": {
         "test": "phpunit"

phpunit.xml.dist

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         bootstrap="./vendor/autoload.php">
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
-    </logging>
+         bootstrap="./vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <report>
+            <text outputFile="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
+        </report>
+    </coverage>
+    <logging/>
     <testsuites>
         <testsuite name="eluceo iCal Test Suite">
             <directory suffix="Test.php">./tests/Eluceo/iCal/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
 </phpunit>

src/Property/Event/RecurrenceRule.php

@@ -245,9 +245,13 @@ public function getUntil()
      */
     public function setFreq($freq)
     {
-        if (@constant('static::FREQ_' . $freq) !== null) {
-            $this->freq = $freq;
-        } else {
+        try {
+            if (@constant('static::FREQ_' . $freq) !== null) {
+                $this->freq = $freq;
+            } else {
+                throw new \InvalidArgumentException("The Frequency {$freq} is not supported.");
+            }
+        } catch (\Error $error) {
             throw new \InvalidArgumentException("The Frequency {$freq} is not supported.");
         }
 

src/PropertyBag.php

@@ -66,7 +66,7 @@ public function add(Property $property)
         return $this;
     }
 
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new \ArrayObject($this->elements);
     }

tests/Eluceo/iCal/Component/CalendarIntegrationTest.php

@@ -61,7 +61,7 @@ public function testExample3()
         {
             $this->assertTrue(isset($lines[$key]), 'Too many lines... ' . $line);
 
-            $this->assertRegExp($lines[$key], $line);
+            $this->assertMatchesRegularExpression($lines[$key], $line);
         }
     }
 
@@ -116,7 +116,7 @@ public function testExample4b()
         {
             $this->assertTrue(isset($lines[$key]), 'Too many lines... ' . $line);
 
-            $this->assertRegExp($lines[$key], $line);
+            $this->assertMatchesRegularExpression($lines[$key], $line);
         }
     }
 
@@ -191,7 +191,7 @@ public function testEventAddAttachment()
         {
             $this->assertTrue(isset($lines[$key]), 'Too many lines... ' . $line);
 
-            $this->assertRegExp($lines[$key], $line);
+            $this->assertMatchesRegularExpression($lines[$key], $line);
         }
     }
 }

tests/Eluceo/iCal/Component/CalendarTest.php

@@ -6,12 +6,11 @@
 
 class CalendarTest extends TestCase
 {
-    /**
-     * @expectedException \UnexpectedValueException
-     * @expectedExceptionMessage PRODID cannot be empty
-     */
     public function testConstructorThrowsUnexpectedValueException()
     {
+        $this->expectExceptionMessage("PRODID cannot be empty");
+        $this->expectException(\UnexpectedValueException::class);
+
         new Calendar(null);
     }
 
@@ -108,6 +107,6 @@ public function testAddEvent()
         $calendar = new Calendar('-//ABC Corporation//NONSGML My Product//EN');
         $calendar->addEvent(new Event('unique_id'));
 
-        $this->assertContains("unique_id", $calendar->render());
+        $this->assertStringContainsString("unique_id", $calendar->render());
     }
 }

tests/Eluceo/iCal/Component/EventTest.php

@@ -65,12 +65,11 @@ public function testSetLocation()
         $this->assertSame('LOCATION:Conference Room - F123\, Bldg. 002', $result['LOCATION']->toLine());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The parameter 'geo' must be a string or an instance of Eluceo\iCal\Property\Event\Geo but an instance of ArrayObject was given.
-     */
     public function testSetLocationOnInvalidGeo()
     {
+        $this->expectExceptionMessage("The parameter 'geo' must be a string or an instance of Eluceo\iCal\Property\Event\Geo but an instance of ArrayObject was given.");
+        $this->expectException(\InvalidArgumentException::class);
+
         $event = new Event('[email protected]');
         $event->setLocation('Conference Room - F123, Bldg. 002', '', new \ArrayObject([25.632, 122.072]));
         $result = $event->buildPropertyBag()->getIterator()->getArrayCopy();

tests/Eluceo/iCal/ComponentTest.php

@@ -26,7 +26,7 @@ public function testFoldWithMultibyte()
 
         $output = $vCalendar->render();
         $output = preg_replace('/\r\n /u', '', $output);
-        $this->assertContains($input, $output);
+        $this->assertStringContainsString($input, $output);
     }
 
     public function testDescriptionWithNewLines()
@@ -42,7 +42,7 @@ public function testDescriptionWithNewLines()
         $vCalendar->addComponent($vEvent);
 
         $output = $vCalendar->render();
-        $this->assertContains(str_replace("\n", "\\n", $input), $output);
+        $this->assertStringContainsString(str_replace("\n", "\\n", $input), $output);
     }
 
     public function testAddComponentOnKey()
@@ -58,7 +58,7 @@ public function testAddComponentOnKey()
         $vCalendar->addComponent($vEvent, 'eventKey');
 
         $output = $vCalendar->render();
-        $this->assertContains(str_replace("\n", "\\n", $input), $output);    
+        $this->assertStringContainsString(str_replace("\n", "\\n", $input), $output);
     }
 
     public function testSetComponents()
@@ -80,8 +80,8 @@ public function testSetComponents()
         $vCalendar->setComponents([$vEventTwo]);
 
         $output = $vCalendar->render();
-        $this->assertContains($shouldBeFound, $output);
-        $this->assertNotContains($shouldNotBeFound, $output);
+        $this->assertStringContainsString($shouldBeFound, $output);
+        $this->assertStringNotContainsString($shouldNotBeFound, $output);
     }
 
     public function testToString()

tests/Eluceo/iCal/Property/Event/AttendeesTest.php

@@ -30,22 +30,20 @@ public function testGetValue()
         $this->assertCount(0, $attendees->getValue());
     }
 
-    /**
-     * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Cannot call setParam on Attendees Property
-     */
     public function testSetParamThrowsBadMethodCallException()
     {
+        $this->expectExceptionMessage("Cannot call setParam on Attendees Property");
+        $this->expectException(\BadMethodCallException::class);
+
         $attendees = new Attendees();
         $attendees->setParam('MAILTO', '[email protected]');
     }
 
-    /**
-     * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage Cannot call getParam on Attendees Property
-     */
     public function testGetParamThrowsBadMethodCallException()
     {
+        $this->expectExceptionMessage("Cannot call getParam on Attendees Property");
+        $this->expectException(\BadMethodCallException::class);
+
         $attendees = new Attendees();
         $attendees->getParam('MAILTO');
     }

tests/Eluceo/iCal/Property/Event/GeoTest.php

@@ -13,21 +13,19 @@ public function testConstructor()
         $this->assertInstanceOf(Geo::class, $geo);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The geographical latitude must be a value between -90 and 90 degrees. '-100' was given.
-     */
     public function testConstructorOnInvalidLatitude()
     {
+        $this->expectExceptionMessage("The geographical latitude must be a value between -90 and 90 degrees. '-100' was given.");
+        $this->expectException(\InvalidArgumentException::class);
+
         new Geo(-100, 122.072);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The geographical longitude must be a value between -180 and 180 degrees. '-200' was given.
-     */
     public function testConstructorOnInvalidLongitude()
     {
+        $this->expectExceptionMessage("The geographical longitude must be a value between -180 and 180 degrees. '-200' was given.");
+        $this->expectException(\InvalidArgumentException::class);
+
         new Geo(25.632, -200);
     }
 

tests/Eluceo/iCal/Property/Event/RecurrenceIdTest.php

@@ -8,7 +8,7 @@ class RecurrenceIdTest extends TestCase
 {
     public function testConstructorOnDateTime()
     {
-        $this->assertInstanceOf(RecurrenceId::class, new RecurrenceId(new \DateTime(null, new \DateTimeZone('Asia/Taipei'))));
+        $this->assertInstanceOf(RecurrenceId::class, new RecurrenceId(new \DateTime('now', new \DateTimeZone('Asia/Taipei'))));
     }
 
     public function testConstructorOnNullDateTime()
@@ -21,7 +21,7 @@ public function testApplyTimeSettings()
         $recurrenceId = new RecurrenceId();
         $recurrenceId->applyTimeSettings();
 
-        $this->assertContains(date('Ymd'), $recurrenceId->getValue()->getValue());
+        $this->assertStringContainsString(date('Ymd'), $recurrenceId->getValue()->getValue());
     }
 
     public function testApplyTimeSettingsOnRange()
@@ -30,21 +30,21 @@ public function testApplyTimeSettingsOnRange()
         $recurrenceId->setRange('RANGE=THISANDPRIOR:19980401T133000Z');
         $recurrenceId->applyTimeSettings();
 
-        $this->assertContains(date('Ymd'), $recurrenceId->getValue()->getValue());
+        $this->assertStringContainsString(date('Ymd'), $recurrenceId->getValue()->getValue());
     }
 
     public function testApplyTimeSettingsOnDefaultParams()
     {
         $recurrenceId = new RecurrenceId();
         $recurrenceId->applyTimeSettings(true, true, true, 'Europe/Berlin');
 
-        $this->assertContains(date('Ymd'), $recurrenceId->getValue()->getValue());
+        $this->assertStringContainsString(date('Ymd'), $recurrenceId->getValue()->getValue());
         $this->assertSame(date('Ymd'), $recurrenceId->getValue()->getValue());
     }
 
     public function testGetDatetime()
     {
-        $recurrenceId = new RecurrenceId(new \DateTime(null, new \DateTimeZone('Europe/Berlin')));
+        $recurrenceId = new RecurrenceId(new \DateTime('now', new \DateTimeZone('Europe/Berlin')));
 
         $this->assertInstanceOf(\DateTime::class, $recurrenceId->getDatetime());
         $this->assertSame('Europe/Berlin', $recurrenceId->getDatetime()->getTimeZone()->getName());
@@ -53,7 +53,7 @@ public function testGetDatetime()
     public function testSetDatetime()
     {
         $recurrenceId = new RecurrenceId();
-        $recurrenceId->setDatetime(new \DateTime(null, new \DateTimeZone('Asia/Taipei')));
+        $recurrenceId->setDatetime(new \DateTime('now', new \DateTimeZone('Asia/Taipei')));
 
         $this->assertInstanceOf(\DateTime::class, $recurrenceId->getDatetime());
         $this->assertSame('Asia/Taipei', $recurrenceId->getDatetime()->getTimeZone()->getName());
@@ -82,12 +82,11 @@ public function testToLines()
         $this->assertSame(['RECURRENCE-ID:value1'], $recurrenceId->toLines());
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage The value must implement the ValueInterface.
-     */
     public function testToLinesThrowsException()
     {
+        $this->expectExceptionMessage("The value must implement the ValueInterface.");
+        $this->expectException(\Exception::class);
+
         $recurrenceId = new RecurrenceId();
 
         $recurrenceId->toLines();