Skip to content

Commit 7720e94

Browse files
ashnazgashnazg
authored
Merge pull request #7 from duboism/port_php8
Port to PHP 8
2 parents 06cbacd + 3b4d483 commit 7720e94

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

‎.github/workflows/main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
operating-system: ['ubuntu-latest']
26-
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
26+
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
2727
steps:
2828
- name: Get source code
2929
uses: actions/checkout@v4

‎Image/Canvas.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class Image_Canvas
150150
*
151151
* @abstract
152152
*/
153-
function Image_Canvas($params)
153+
function __construct($params)
154154
{
155155
if (isset($params['left'])) {
156156
$this->_left = $params['left'];
@@ -786,7 +786,7 @@ function toHtml($params)
786786
* PEAR_Error on error
787787
* @static
788788
*/
789-
function &factory($canvas, $params)
789+
static function &factory($canvas, $params)
790790
{
791791
$canvas = strtoupper($canvas);
792792

‎Image/Canvas/Color.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Image_Canvas_Color extends Image_Color
5858
* @access public
5959
* @static
6060
*/
61-
function allocateColor(&$img, $color)
61+
static function allocateColor(&$img, $color)
6262
{
6363
$color = Image_Canvas_Color::color2RGB($color);
6464

@@ -81,7 +81,7 @@ function allocateColor(&$img, $color)
8181
* @access public
8282
* @static
8383
*/
84-
function color2RGB($color)
84+
static function color2RGB($color)
8585
{
8686
if (is_array($color)) {
8787
if (!is_numeric($color[0])) {

‎Image/Canvas/GD.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ class Image_Canvas_GD extends Image_Canvas_WithMap
151151
*
152152
* @param array $param Parameter array
153153
*/
154-
function Image_Canvas_GD($param)
154+
function __construct($param)
155155
{
156156
include_once 'Image/Canvas/Color.php';
157157

158-
parent::Image_Canvas_WithMap($param);
158+
parent::__construct($param);
159159

160160
$this->_gd2 = ($this->_version() == 2);
161161
$this->_pxToPtFactor = ($this->_gd2 ? (72/96) : 1);

‎Image/Canvas/GD/JPG.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class Image_Canvas_GD_JPG extends Image_Canvas_GD
6767
*
6868
* @param array $param Parameter array
6969
*/
70-
function Image_Canvas_GD_JPG($param)
70+
function __construct($param)
7171
{
72-
parent::Image_Canvas_GD($param);
72+
parent::__construct($param);
7373

7474
if (isset($param['quality'])) {
7575
$this->_quality = max(0, min(100, $param['quality']));

‎Image/Canvas/GD/PNG.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ class Image_Canvas_GD_PNG extends Image_Canvas_GD
5454
*
5555
* @param array $param Parameter array
5656
*/
57-
function Image_Canvas_GD_PNG($param)
57+
function __construct($param)
5858
{
59-
parent::Image_Canvas_GD($param);
59+
parent::__construct($param);
6060

6161
if ((isset($param['transparent'])) && ($param['transparent'])
6262
&& ($this->_gd2)

‎Image/Canvas/ImageMap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ function save($params = false)
369369
function toHtml($params)
370370
{
371371
if (count($this->_map) > 0) {
372-
return '<map name="' . $params['name'] . '" id="' . $params['name'] . '">' . "\n\t" . implode($this->_map, "\n\t") . "\n</map>";
372+
return '<map name="' . $params['name'] . '" id="' . $params['name'] . '">' . "\n\t" . implode("\n\t", $this->_map) . "\n</map>";
373373
}
374374
return '';
375375
}

‎Image/Canvas/PDF.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class Image_Canvas_PDF extends Image_Canvas
147147
*
148148
* @param array $param Parameter array
149149
*/
150-
function Image_Canvas_PDF($param)
150+
function __construct($param)
151151
{
152152
if (isset($param['page'])) {
153153
switch (strtoupper($param['page'])) {
@@ -234,7 +234,7 @@ function Image_Canvas_PDF($param)
234234
$this->_pageHeight = $w;
235235
}
236236

237-
parent::Image_Canvas($param);
237+
parent::__construct($param);
238238

239239
if (!$this->_pageWidth) {
240240
$this->_pageWidth = $this->_width;

‎Image/Canvas/PS.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class Image_Canvas_PS extends Image_Canvas
144144
*
145145
* @param array $param Parameter array
146146
*/
147-
function Image_Canvas_PS($param)
147+
function __construct($param)
148148
{
149149
if (isset($param['page'])) {
150150
switch (strtoupper($param['page'])) {
@@ -233,7 +233,7 @@ function Image_Canvas_PS($param)
233233
$this->_pageHeight = $w;
234234
}
235235

236-
parent::Image_Canvas($param);
236+
parent::__construct($param);
237237

238238
if (!$this->_pageWidth) {
239239
$this->_pageWidth = $this->_width;

‎Image/Canvas/SVG.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ class Image_Canvas_SVG extends Image_Canvas
107107
*
108108
* @return void
109109
*/
110-
function Image_Canvas_SVG($params)
110+
function __construct($params)
111111
{
112-
parent::Image_Canvas($params);
112+
parent::__construct($params);
113113
$this->_reset();
114114

115115
if (isset($params['encoding'])) {

‎Image/Canvas/SWF.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ class Image_Canvas_SWF extends Image_Canvas
8888
*
8989
* @return Image_Canvas_SWF
9090
*/
91-
function Image_Canvas_SWF($params)
91+
function __construct($params)
9292
{
93-
parent::Image_Canvas($params);
93+
parent::__construct($params);
9494
$this->_reset();
9595

9696
$version = (isset($params['version']) && $params['version'] <= 6)

‎Image/Canvas/Tool.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class Image_Canvas_Tool
6969
* @return string The filename of the font
7070
* @static
7171
*/
72-
function fontMap($name, $type = '.ttf')
72+
static function fontMap($name, $type = '.ttf')
7373
{
7474
static $_fontMap;
7575

@@ -126,7 +126,7 @@ function fontMap($name, $type = '.ttf')
126126
* @return double The average of P1 and P2
127127
* @static
128128
*/
129-
function mid($p1, $p2)
129+
static function mid($p1, $p2)
130130
{
131131
return ($p1 + $p2) / 2;
132132
}
@@ -142,7 +142,7 @@ function mid($p1, $p2)
142142
* @return double $p1 mirrored in $p2 by Factor
143143
* @static
144144
*/
145-
function mirror($p1, $p2, $factor = 1)
145+
static function mirror($p1, $p2, $factor = 1)
146146
{
147147
return $p2 + $factor * ($p2 - $p1);
148148
}
@@ -159,7 +159,7 @@ function mirror($p1, $p2, $factor = 1)
159159
* @return double P1 mirrored in P2 by Factor
160160
* @static
161161
*/
162-
function controlPoint($p1, $p2, $factor, $smoothFactor = 0.75)
162+
static function controlPoint($p1, $p2, $factor, $smoothFactor = 0.75)
163163
{
164164
$sa = Image_Canvas_Tool::mirror($p1, $p2, $smoothFactor);
165165
$sb = Image_Canvas_Tool::mid($p2, $sa);
@@ -185,7 +185,7 @@ function controlPoint($p1, $p2, $factor, $smoothFactor = 0.75)
185185
* $p1 and $p4 to calculate control points
186186
* @static
187187
*/
188-
function bezier($t, $p1, $p2, $p3, $p4)
188+
static function bezier($t, $p1, $p2, $p3, $p4)
189189
{
190190
// (1-t)^3*p1 + 3*(1-t)^2*t*p2 + 3*(1-t)*t^2*p3 + t^3*p4
191191
return pow(1 - $t, 3) * $p1 +
@@ -205,7 +205,7 @@ function bezier($t, $p1, $p2, $p3, $p4)
205205
* @return double The angle in degrees of the line
206206
* @static
207207
*/
208-
function getAngle($x0, $y0, $x1, $y1)
208+
static function getAngle($x0, $y0, $x1, $y1)
209209
{
210210

211211
$dx = ($x1 - $x0);

‎Image/Canvas/WithMap.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class Image_Canvas_WithMap extends Image_Canvas
7272
*
7373
* @abstract
7474
*/
75-
function Image_Canvas_WithMap($params)
75+
function __construct($params)
7676
{
77-
parent::Image_Canvas($params);
77+
parent::__construct($params);
7878

7979
if ((isset($params['usemap'])) && ($params['usemap'] === true)) {
8080
$this->_imageMap =& Image_Canvas::factory(

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"type": "library",
2525
"require": {
26-
"php": ">=5.6, < 8.0",
26+
"php": ">=5.6",
2727
"pear/pear_exception": "*",
2828
"pear/image_color": "*"
2929
}

0 commit comments

Comments
 (0)