Bump to PHP 8.2 (#103)

julianxhokaxhiu · Jun 25, 2023 · 23d6560 · 23d6560
1 parent 3c87be0
commit 23d6560
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,3 @@
 .git
 Dockerfile
+builds
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.2-apache
 MAINTAINER Julian Xhokaxhiu <info at julianxhokaxhiu dot com>
 
 # internal variables
@@ -52,4 +52,4 @@ RUN chmod -R 0775 /var/www/html \
     && chown -R www-data:www-data /var/www/html
 
 # create volumes
-VOLUME $FULL_BUILDS_DIR
+VOLUME $FULL_BUILDS_DIR
diff --git a/src/Helpers/Build.php b/src/Helpers/Build.php
@@ -285,7 +285,7 @@ protected function _getChannel( $token, $type, $version ) {
          * @param string $fileName The name of the file
          * @return string The absolute URL for the file to be downloaded
          */
-        protected function _getUrl( $fileName = '', $basePath ) {
+        protected function _getUrl( $fileName, $basePath ) {
             $prop = $this->getBuildPropValue( 'ro.build.ota.url' );
 
             if( !empty( $prop ) )

diff --git a/views/ota-list-columns.twig b/views/ota-list-columns.twig
@@ -47,9 +47,9 @@
                     <td>{% set filename = build['filename'] %}{{ formatedFileSizes[filename] }}</td>
 
 {% if build['url'] matches '/github\.com/' %}
-                    <td><a href="' . {{ branding['GithubURL'] }}">Github</a></td>
+                    <td><a href="{{ branding['GithubURL'] }}">Github</a></td>
 {% else %}
-                    <td><a href="' . {{ branding['LocalURL'] }}">local</a></td>
+                    <td><a href="{{ branding['LocalURL'] }}">local</a></td>
 {% endif %}
 
                     <td>{{ build['timestamp'] | date('Y/m/d') }}</td>

diff --git a/views/ota-list-javascript.twig b/views/ota-list-javascript.twig
@@ -62,9 +62,9 @@
                         <td><a href="{{ build['url'] }}">{{ build['filename'] }}</a><br>[md5sum: {{ build['md5sum'] }}]</td>
                         <td>{% set filename = build['filename'] %}{{ formatedFileSizes[filename] }}</td>
 {% if build['url'] matches '/github\.com/' %}
-                        <td><a href="' . {{ branding['GithubURL'] }}">Github</a></td>
+                        <td><a href="{{ branding['GithubURL'] }}">Github</a></td>
 {% else %}
-                        <td><a href="' . {{ branding['LocalURL'] }}">local</a></td>
+                        <td><a href="{{ branding['LocalURL'] }}">local</a></td>
 {% endif %}
                         <td>{{ build['timestamp'] | date('Y/m/d') }}</td>
                     </tr>

diff --git a/views/ota-list-tables.twig b/views/ota-list-tables.twig
@@ -43,9 +43,9 @@
             <td>{% set filename = build['filename'] %}{{ formatedFileSizes[filename] }}</td>
 
 {% if build['url'] matches '/github\.com/' %}
-            <td><a href="' . {{ branding['GithubURL'] }}">Github</a></td>
+            <td><a href="{{ branding['GithubURL'] }}">Github</a></td>
 {% else %}
-            <td><a href="' . {{ branding['LocalURL'] }}">local</a></td>
+            <td><a href="{{ branding['LocalURL'] }}">local</a></td>
 {% endif %}
 
             <td>{{ build['timestamp'] | date('Y/m/d') }}</td>