Merge pull request #12153 from nupplaphil/feat/woodpecker

Woodpecker: Update PHP version
friendica · Nov 10, 2022 · 87bb4d4 · 87bb4d4
2 parents 59b48c2 + 3550257
commit 87bb4d4
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
@@ -39,7 +39,7 @@ pipeline:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php7.4:php7.4.18
+    image: friendicaci/php7.4:php7.4.33
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

diff --git a/.woodpecker/.database_checks.yml b/.woodpecker/.database_checks.yml
@@ -1,7 +1,7 @@
 matrix:
   include:
     - PHP_MAJOR_VERSION: 7.4
-      PHP_VERSION: 7.4.18
+      PHP_VERSION: 7.4.33
 
 branches:
   exclude: [ stable ]

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
@@ -1,11 +1,13 @@
 matrix:
   include:
     - PHP_MAJOR_VERSION: 7.3
-      PHP_VERSION: 7.3.28
+      PHP_VERSION: 7.3.33
     - PHP_MAJOR_VERSION: 7.4
-      PHP_VERSION: 7.4.18
+      PHP_VERSION: 7.4.33
     - PHP_MAJOR_VERSION: 8.0
-      PHP_VERSION: 8.0.5
+      PHP_VERSION: 8.0.25
+#    - PHP_MAJOR_VERSION: 8.1
+#      PHP_VERSION: 8.1.12
 
 pipeline:
   php-lint:

diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
@@ -37,7 +37,7 @@ pipeline:
       branch: stable
       event: tag
   composer_install:
-    image: friendicaci/php7.4:php7.4.18
+    image: friendicaci/php7.4:php7.4.33
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

diff --git a/src/App/Page.php b/src/App/Page.php
@@ -130,7 +130,7 @@ public function logRuntime(IManageConfigValues $config, string $origin = '')
 	 * The return value will be casted to boolean if non-boolean was returned.
 	 * @since 5.0.0
 	 */
-	public function offsetExists($offset)
+	public function offsetExists($offset): bool
 	{
 		return isset($this->page[$offset]);
 	}

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
@@ -188,10 +188,10 @@ public static function detectLanguage(array $server, array $get, string $sysLang
 	{
 		$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
 
-		$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
-
-		if (empty($acceptedLanguages)) {
+		if (empty($lang_variable)) {
 			$acceptedLanguages = [];
+		} else {
+			$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
 		}
 
 		// Add get as absolute quality accepted language (except this language isn't valid)

diff --git a/src/Util/Network.php b/src/Util/Network.php
@@ -485,11 +485,11 @@ public static function unparseURL(array $parsed): string
 						$get('host') .
 						($port ? ":$port" : '');
 
-		return	(strlen($scheme) ? $scheme . ':' : '') .
-			(strlen($authority) ? '//' . $authority : '') .
+		return	(!empty($scheme) ? $scheme . ':' : '') .
+			(!empty($authority) ? '//' . $authority : '') .
 			$get('path') .
-			(strlen($query) ? '?' . $query : '') .
-			(strlen($fragment) ? '#' . $fragment : '');
+			(!empty($query) ? '?' . $query : '') .
+			(!empty($fragment) ? '#' . $fragment : '');
 	}
 
 	/**

diff --git a/src/Util/ReversedFileReader.php b/src/Util/ReversedFileReader.php
@@ -60,7 +60,7 @@ public function open(string $filename): ReversedFileReader
 		$this->fh = fopen($filename, 'r');
 		if (!$this->fh) {
 			// this should use a custom exception.
-			throw \Exception("Unable to open $filename");
+			throw new \Exception("Unable to open $filename");
 		}
 		$this->filesize = filesize($filename);
 		$this->pos      = -1;