Merge pull request #9 from Astrotomic/php-71

Gummibeer · web-flow · commit 7a47eac83b6b · 2020-08-06T11:41:17.000+02:00
Backport to PHP 7.1
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4]
+        php: [7.1, 7.2, 7.3, 7.4]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^7.1",
         "astrotomic/php-conditional-proxy": "^0.2.0"
     },
     "require-dev": {
diff --git a/src/BaseObject.php b/src/BaseObject.php
@@ -9,7 +9,7 @@ abstract class BaseObject
     use HasConditionalCalls;
 
     /** @var BaseObject[] */
-    protected array $tags = [];
+    protected $tags = [];
 
     public function setProperty(string $prefix, string $property, string $content)
     {
diff --git a/src/Property.php b/src/Property.php
@@ -4,9 +4,14 @@
 
 class Property
 {
-    protected string $prefix = 'og';
-    protected string $property;
-    protected string $content;
+    /** @var string */
+    protected $prefix = 'og';
+
+    /** @var string */
+    protected $property;
+
+    /** @var string */
+    protected $content;
 
     public function __construct(string $prefix, string $property, string $content)
     {
diff --git a/src/Type.php b/src/Type.php
@@ -8,7 +8,8 @@
 
 abstract class Type extends BaseObject
 {
-    protected string $type;
+    /** @var string */
+    protected $type;
 
     public function __construct(?string $title = null)
     {
diff --git a/src/Types/Article.php b/src/Types/Article.php
@@ -9,7 +9,8 @@ class Article extends Type
 {
     protected const PREFIX = 'article';
 
-    protected string $type = 'article';
+    /** @var string */
+    protected $type = 'article';
 
     public function author(string $url)
     {
diff --git a/src/Types/Book.php b/src/Types/Book.php
@@ -9,7 +9,8 @@ class Book extends Type
 {
     protected const PREFIX = 'book';
 
-    protected string $type = 'book';
+    /** @var string */
+    protected $type = 'book';
 
     public function author(string $url)
     {
diff --git a/src/Types/Music/Album.php b/src/Types/Music/Album.php
@@ -9,7 +9,8 @@ class Album extends Type
 {
     protected const PREFIX = 'music';
 
-    protected string $type = 'music.album';
+    /** @var string */
+    protected $type = 'music.album';
 
     public function musician(string $url)
     {
diff --git a/src/Types/Music/Playlist.php b/src/Types/Music/Playlist.php
@@ -8,7 +8,8 @@ class Playlist extends Type
 {
     protected const PREFIX = 'music';
 
-    protected string $type = 'music.playlist';
+    /** @var string */
+    protected $type = 'music.playlist';
 
     public function creator(string $url)
     {
diff --git a/src/Types/Music/RadioStation.php b/src/Types/Music/RadioStation.php
@@ -8,7 +8,8 @@ class RadioStation extends Type
 {
     protected const PREFIX = 'music';
 
-    protected string $type = 'music.radio_station';
+    /** @var string */
+    protected $type = 'music.radio_station';
 
     public function creator(string $url)
     {
diff --git a/src/Types/Music/Song.php b/src/Types/Music/Song.php
@@ -8,7 +8,8 @@ class Song extends Type
 {
     protected const PREFIX = 'music';
 
-    protected string $type = 'music.song';
+    /** @var string */
+    protected $type = 'music.song';
 
     public function duration(int $seconds)
     {
diff --git a/src/Types/Profile.php b/src/Types/Profile.php
@@ -8,7 +8,8 @@ class Profile extends Type
 {
     protected const PREFIX = 'profile';
 
-    protected string $type = 'profile';
+    /** @var string */
+    protected $type = 'profile';
 
     public function firstName(string $firstName)
     {
diff --git a/src/Types/Twitter/Player.php b/src/Types/Twitter/Player.php
@@ -6,7 +6,8 @@
 
 class Player extends TwitterType
 {
-    protected string $type = 'player';
+    /** @var string */
+    protected $type = 'player';
 
     public function player(string $url, int $width, int $height)
     {
diff --git a/src/Types/Twitter/Summary.php b/src/Types/Twitter/Summary.php
@@ -6,5 +6,6 @@
 
 class Summary extends TwitterType
 {
-    protected string $type = 'summary';
+    /** @var string */
+    protected $type = 'summary';
 }
diff --git a/src/Types/Twitter/SummaryLargeImage.php b/src/Types/Twitter/SummaryLargeImage.php
@@ -6,7 +6,8 @@
 
 class SummaryLargeImage extends TwitterType
 {
-    protected string $type = 'summary_large_image';
+    /** @var string */
+    protected $type = 'summary_large_image';
 
     public function creator(string $creator)
     {
diff --git a/src/Types/Video/Episode.php b/src/Types/Video/Episode.php
@@ -9,7 +9,8 @@ class Episode extends Type
 {
     protected const PREFIX = 'video';
 
-    protected string $type = 'video.episode';
+    /** @var string */
+    protected $type = 'video.episode';
 
     public function series(string $url)
     {
diff --git a/src/Types/Video/Movie.php b/src/Types/Video/Movie.php
@@ -9,7 +9,8 @@ class Movie extends Type
 {
     protected const PREFIX = 'video';
 
-    protected string $type = 'video.movie';
+    /** @var string */
+    protected $type = 'video.movie';
 
     public function actor(string $url, ?string $role = null)
     {
diff --git a/src/Types/Video/Other.php b/src/Types/Video/Other.php
@@ -9,7 +9,8 @@ class Other extends Type
 {
     protected const PREFIX = 'video';
 
-    protected string $type = 'video.other';
+    /** @var string */
+    protected $type = 'video.other';
 
     public function actor(string $url, ?string $role = null)
     {
diff --git a/src/Types/Video/TvShow.php b/src/Types/Video/TvShow.php
@@ -9,7 +9,8 @@ class TvShow extends Type
 {
     protected const PREFIX = 'video';
 
-    protected string $type = 'video.tv_show';
+    /** @var string */
+    protected $type = 'video.tv_show';
 
     public function actor(string $url, ?string $role = null)
     {
diff --git a/src/Types/Website.php b/src/Types/Website.php
@@ -6,5 +6,6 @@
 
 class Website extends Type
 {
-    protected string $type = 'website';
+    /** @var string */
+    protected $type = 'website';
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"require": {`
`18`		`- "php": "^7.4",`
	`18`	`+ "php": "^7.1",`
`19`	`19`	`"astrotomic/php-conditional-proxy": "^0.2.0"`
`20`	`20`	`},`
`21`	`21`	`"require-dev": {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ abstract class BaseObject`
`9`	`9`	`use HasConditionalCalls;`
`10`	`10`
`11`	`11`	`/** @var BaseObject[] */`
`12`		`- protected array $tags = [];`
	`12`	`+ protected $tags = [];`
`13`	`13`
`14`	`14`	`public function setProperty(string $prefix, string $property, string $content)`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`
`9`	`9`	`abstract class Type extends BaseObject`
`10`	`10`	`{`
`11`		`- protected string $type;`
	`11`	`+ /** @var string */`
	`12`	`+ protected $type;`
`12`	`13`
`13`	`14`	`public function __construct(?string $title = null)`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ class Article extends Type`
`9`	`9`	`{`
`10`	`10`	`protected const PREFIX = 'article';`
`11`	`11`
`12`		`- protected string $type = 'article';`
	`12`	`+ /** @var string */`
	`13`	`+ protected $type = 'article';`
`13`	`14`
`14`	`15`	`public function author(string $url)`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ class Book extends Type`
`9`	`9`	`{`
`10`	`10`	`protected const PREFIX = 'book';`
`11`	`11`
`12`		`- protected string $type = 'book';`
	`12`	`+ /** @var string */`
	`13`	`+ protected $type = 'book';`
`13`	`14`
`14`	`15`	`public function author(string $url)`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ class Album extends Type`
`9`	`9`	`{`
`10`	`10`	`protected const PREFIX = 'music';`
`11`	`11`
`12`		`- protected string $type = 'music.album';`
	`12`	`+ /** @var string */`
	`13`	`+ protected $type = 'music.album';`
`13`	`14`
`14`	`15`	`public function musician(string $url)`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ class Playlist extends Type`
`8`	`8`	`{`
`9`	`9`	`protected const PREFIX = 'music';`
`10`	`10`
`11`		`- protected string $type = 'music.playlist';`
	`11`	`+ /** @var string */`
	`12`	`+ protected $type = 'music.playlist';`
`12`	`13`
`13`	`14`	`public function creator(string $url)`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ class RadioStation extends Type`
`8`	`8`	`{`
`9`	`9`	`protected const PREFIX = 'music';`
`10`	`10`
`11`		`- protected string $type = 'music.radio_station';`
	`11`	`+ /** @var string */`
	`12`	`+ protected $type = 'music.radio_station';`
`12`	`13`
`13`	`14`	`public function creator(string $url)`
`14`	`15`	`{`