Bump minimum PHP to 7.4

Author: ddebin

.php-cs-fixer.php

@@ -13,6 +13,15 @@
     '@PhpCsFixer:risky' => true,
     '@PHP71Migration' => true,
     '@PHP71Migration:risky' => true,
+    '@PHP73Migration' => true,
+    '@PHP74Migration' => true,
+    '@PHP74Migration:risky' => true,
+    '@PHPUnit75Migration:risky' => true,
+    '@PHPUnit7x5Migration:risky' => true,
+    '@PHPUnit84Migration:risky' => true,
+    '@PHPUnit8x4Migration:risky' => true,
+    '@PHPUnit91Migration:risky' => true,
+    '@PHPUnit9x1Migration:risky' => true,
     'array_syntax' => ['syntax' => 'short'],
     'php_unit_test_class_requires_covers' => false,
     'backtick_to_shell_exec' => true,

composer.json

@@ -16,7 +16,7 @@
     }
   ],
   "require": {
-    "php": "^7.1 || ^8.0",
+    "php": "^7.4 || ^8.0",
     "ext-dom": "*",
     "ext-filter": "*",
     "ext-libxml": "*",
@@ -25,11 +25,11 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.0",
-    "phpstan/phpstan": "^1.0 || ^2.0",
-    "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
-    "phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
-    "phpstan/phpstan-webmozart-assert": "^1.0 || ^2.0",
-    "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+    "phpstan/phpstan": "^2.0",
+    "phpstan/phpstan-phpunit": "^2.0",
+    "phpstan/phpstan-strict-rules": "^2.0",
+    "phpstan/phpstan-webmozart-assert": "^2.0",
+    "phpunit/phpunit": "^9.1 || ^10.0"
   },
   "config": {
     "sort-packages": true

example/feed.php

@@ -5,7 +5,7 @@
 use AtomGenerator\Entry;
 use AtomGenerator\Feed;
 
-include_once 'vendor/autoload.php';
+include_once __DIR__.'/../vendor/autoload.php';
 
 $entry = new Entry();
 $entry->setTitle('Post', 'text');

phpunit.xml

@@ -3,12 +3,12 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src</directory>
             <directory suffix=".php">tests</directory>
         </include>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>

src/AbstractElement.php

@@ -12,35 +12,29 @@
 
 abstract class AbstractElement
 {
-    /** @var string */
-    protected $id;
+    protected string $id;
 
-    /** @var string */
-    protected $title;
+    protected string $title;
 
-    /** @var null|string */
-    protected $titleType;
+    protected ?string $titleType = null;
 
-    /** @var DateTimeInterface */
-    protected $updatedDateTime;
+    protected DateTimeInterface $updatedDateTime;
 
-    /** @var null|string */
-    protected $rights;
+    protected ?string $rights = null;
 
-    /** @var null|string */
-    protected $rightsType;
+    protected ?string $rightsType = null;
 
     /** @var string[][] */
-    protected $authors = [];
+    protected array $authors = [];
 
     /** @var string[][] */
-    protected $contributors = [];
+    protected array $contributors = [];
 
     /** @var string[][] */
-    protected $categories = [];
+    protected array $categories = [];
 
     /** @var string[][] */
-    protected $links = [];
+    protected array $links = [];
 
     /**
      * AbstractElement constructor.

src/Entry.php

@@ -10,26 +10,19 @@
 
 class Entry extends AbstractElement
 {
-    /** @var null|string */
-    protected $summary;
+    protected ?string $summary = null;
 
-    /** @var null|string */
-    protected $summaryType;
+    protected ?string $summaryType = null;
 
-    /** @var null|string */
-    protected $content;
+    protected ?string $content = null;
 
-    /** @var null|string */
-    protected $contentType;
+    protected ?string $contentType = null;
 
-    /** @var null|string */
-    protected $contentSrc;
+    protected ?string $contentSrc = null;
 
-    /** @var null|DateTimeInterface */
-    protected $publishedDateTime;
+    protected ?DateTimeInterface $publishedDateTime = null;
 
-    /** @var null|Feed */
-    protected $source;
+    protected ?Feed $source = null;
 
     public function setSummary(?string $summary, ?string $type = null): void
     {

src/Feed.php

@@ -5,45 +5,38 @@
 namespace AtomGenerator;
 
 use DOMDocument;
+use Exception;
 use LibXMLError;
 use SimpleXMLElement;
 use Webmozart\Assert\Assert;
 
 class Feed extends AbstractElement
 {
     /** @var Entry[] */
-    protected $entries = [];
+    protected array $entries = [];
 
-    /** @var bool */
-    protected $prettify = false;
+    protected bool $prettify = false;
 
-    /** @var null|string */
-    protected $language;
+    protected ?string $language = null;
 
-    /** @var null|string */
-    protected $subtitle;
+    protected ?string $subtitle = null;
 
-    /** @var null|string */
-    protected $icon;
+    protected ?string $icon = null;
 
-    /** @var null|string */
-    protected $logo;
+    protected ?string $logo = null;
 
-    /** @var null|string */
-    protected $generator;
+    protected ?string $generator = null;
 
-    /** @var null|string */
-    protected $generatorVersion;
+    protected ?string $generatorVersion = null;
 
-    /** @var null|string */
-    protected $generatorUri;
+    protected ?string $generatorUri = null;
 
     /**
      * @var array[]
      *
      * @phpstan-var array<array{ns: string, uri: string, name: string, value: string, attributes: string[]}>
      */
-    protected $customElements = [];
+    protected array $customElements = [];
 
     /**
      * Feed constructor.
@@ -174,6 +167,9 @@ public function addChildrenTo(SimpleXMLElement $parent): void
         }
     }
 
+    /**
+     * @throws Exception
+     */
     public function getSimpleXML(): SimpleXMLElement
     {
         $attributes = [];

tests/FeedTest.php

@@ -17,12 +17,15 @@
 final class FeedTest extends TestCase
 {
     protected const TEST_FEED_XML_PATH_1 = __DIR__.'/feed_1.xml';
+
     protected const TEST_FEED_XML_PATH_2 = __DIR__.'/feed_2.xml';
+
     protected const TEST_FEED_XML_PATH_3 = __DIR__.'/feed_3.xml';
+
     protected const TEST_FEED_XML_PATH_4 = __DIR__.'/feed_4.xml';
 
     /** @var bool reset file contents */
-    protected static $reset = false;
+    protected static bool $reset = false;
 
     public function testFeedCreation1(): void
     {