Skip to content

Commit 1c5ebd3

Browse files
committed
update to laminas
1 parent cbdf348 commit 1c5ebd3

28 files changed

+6075
-321
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
data
22
vendor
3-
composer.lock
43
phing*.phar
5-
*.bat
4+
*.bat
5+
.idea
6+
.phpunit.result.cache

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
language: php
22

33
php:
4-
- 5.6
5-
- 7
6-
- 7.1
74
- 7.2
5+
- 7.3
6+
- 7.4
7+
- 8
88

99
before_script:
1010
- composer update --prefer-source
1111

1212
script:
1313
- ./vendor/bin/phpunit
14-
- ./vendor/bin/phpcs --standard=PSR2 --ignore="test/Bootstrap.php" ./src/ ./test/
14+
- ./vendor/bin/phpcs --standard=PSR2 --ignore="test/Bootstrap.php" ./src/ ./tests/
1515

1616
after_script:
17-
- if [ $TRAVIS_PHP_VERSION != '7' ] && [ $TRAVIS_PHP_VERSION != '7.1' ] && [ $TRAVIS_PHP_VERSION != '7.2' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
18-
- if [ $TRAVIS_PHP_VERSION != '7' ] && [ $TRAVIS_PHP_VERSION != '7.1' ] && [ $TRAVIS_PHP_VERSION != '7.2' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi
17+
- if [ $TRAVIS_PHP_VERSION != '7.3' ] && [ $TRAVIS_PHP_VERSION != '7.4' ] && [ $TRAVIS_PHP_VERSION != '8' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
18+
- if [ $TRAVIS_PHP_VERSION != '7.3' ] && [ $TRAVIS_PHP_VERSION != '7.4' ] && [ $TRAVIS_PHP_VERSION != '8' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi
1919

2020
notifications:
2121
email: false

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@
77
[![Total Downloads](https://poser.pugx.org/tck/zf2-imageresizer/downloads)](https://packagist.org/packages/tck/zf2-imageresizer)
88
[![License](https://poser.pugx.org/tck/zf2-imageresizer/license)](https://packagist.org/packages/tck/zf2-imageresizer)
99

10-
This Zend Framework module, once enabled, allows image resizing and manipulation by url.
10+
This Laminas module, once enabled, allows image resizing and manipulation by url.
1111

1212

1313
### Requirements
1414

15-
* PHP 5.6+
16-
* [Zend Framework 3](https://github.com/zendframework/zendframework) (> 3.0)
17-
* [Imagine](http://imagine.readthedocs.org/en/latest/) (> 0.6)
15+
* PHP 7.2+
16+
* [Laminas MVC](https://docs.laminas.dev/mvc/)
17+
* [Imagine](http://imagine.readthedocs.org/en/latest/)
1818

19-
> **IMPORTANT! Version notes**
19+
> **IMPORTANT! Version notes**
20+
> * Version **3.x**: Laminas, dropped support for Zend Framework 3.
2021
> * Version **2.x**: Zend Framework 3, dropped support for Zend Framework 2.
2122
> * Version **1.x**: Zend Framework 2
2223
2324
### Installation
2425

25-
Install via composer in your zf project
26+
Install via composer in your Laminas project
2627

2728
$ composer require tck/zf2-imageresizer
2829

@@ -59,7 +60,7 @@ Example: Create a thumbnail and grayscale image
5960
* `processed/`img/logo`.$thumb,160,120$grayscale`.jpg
6061

6162
#### View helper
62-
ZF2 tempalte:
63+
Laminas tempalte:
6364

6465
```php
6566
<img alt="Example image" src="<?php echo $this->resize('img/logo.jpg')->thumb(200, 160)->grayscale(); ?>" />

build.xml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
</condition>
99

1010
<target name="build"
11-
depends="prepare,vendor,lint,phploc-ci,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit,phpdox"
11+
depends="prepare,vendor,lint,phploc-ci,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit"
1212
description=""/>
1313

1414
<target name="build-parallel"
15-
depends="prepare,vendor,lint,tools-parallel,phpunit,phpdox"
15+
depends="prepare,vendor,lint,tools-parallel,phpunit"
1616
description=""/>
1717

1818
<target name="tools-parallel" description="Run tools in parallel">
@@ -34,7 +34,6 @@
3434
<delete dir="${basedir}/build/coverage"/>
3535
<delete dir="${basedir}/build/logs"/>
3636
<delete dir="${basedir}/build/pdepend"/>
37-
<delete dir="${basedir}/build/phpdox"/>
3837
<property name="clean.done" value="true"/>
3938
</target>
4039

@@ -46,7 +45,6 @@
4645
<mkdir dir="${basedir}/build/coverage"/>
4746
<mkdir dir="${basedir}/build/logs"/>
4847
<mkdir dir="${basedir}/build/pdepend"/>
49-
<mkdir dir="${basedir}/build/phpdox"/>
5048
<property name="prepare.done" value="true"/>
5149
</target>
5250

@@ -68,7 +66,7 @@
6866
<modified />
6967
</fileset>
7068

71-
<fileset dir="${basedir}/test">
69+
<fileset dir="${basedir}/tests">
7270
<include name="**/*.php" />
7371
<modified />
7472
</fileset>
@@ -83,7 +81,7 @@
8381
<exec executable="${toolsdir}phploc${script-suffix}" taskname="phploc">
8482
<arg value="--count-tests" />
8583
<arg path="${basedir}/src" />
86-
<arg path="${basedir}/test" />
84+
<arg path="${basedir}/tests" />
8785
</exec>
8886

8987
<property name="phploc.done" value="true"/>
@@ -100,7 +98,7 @@
10098
<arg value="--log-xml" />
10199
<arg path="${basedir}/build/logs/phploc.xml" />
102100
<arg path="${basedir}/src" />
103-
<arg path="${basedir}/test" />
101+
<arg path="${basedir}/tests" />
104102
</exec>
105103

106104
<property name="phploc.done" value="true"/>
@@ -155,7 +153,7 @@
155153
<arg value="--extensions=php" />
156154
<arg value="--ignore=autoload.php" />
157155
<arg path="${basedir}/src" />
158-
<arg path="${basedir}/test" />
156+
<arg path="${basedir}/tests" />
159157
</exec>
160158

161159
<property name="phpcs.done" value="true"/>
@@ -212,13 +210,4 @@
212210
<property name="phpunit.done" value="true"/>
213211
</target>
214212

215-
<target name="phpdox"
216-
unless="phpdox.done"
217-
depends="phploc-ci,phpcs-ci,phpmd-ci"
218-
description="Generate API documentation using phpDox">
219-
<exec executable="${toolsdir}phpdox${script-suffix}" dir="${basedir}/build" taskname="phpdox"/>
220-
221-
<property name="phpdox.done" value="true"/>
222-
</target>
223213
</project>
224-

build/.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
api
2-
coverage
2+
html-coverage
33
logs
4-
pdepend
5-
phpdox
4+
pdepend

build/phpdox.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

composer.json

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tck/zf2-imageresizer",
3-
"description": "Image resizer and manipulation module for Zend Framework 3",
3+
"description": "Image resizer and manipulation module for Laminas",
44
"type": "library",
55
"authors": [
66
{
@@ -13,44 +13,48 @@
1313
"image",
1414
"zend",
1515
"zf2",
16+
"zf3",
17+
"laminas",
18+
"mvc",
1619
"php"
1720
],
1821
"homepage": "https://github.com/tck/zf2-imageresizer",
1922
"license": [
2023
"MIT"
2124
],
2225
"require": {
23-
"php": "^5.6 || ^7.0",
24-
"zendframework/zend-mvc": "^3.0.1",
25-
"zendframework/zend-loader": "^2.5.1",
26-
"zendframework/zend-modulemanager": "^2.7.2",
27-
"zendframework/zend-config": "^2.6 || ^3.0",
28-
"zendframework/zend-cache": "^2.7.1",
29-
"zendframework/zend-log": "^2.9",
30-
"zendframework/zend-view": "^2.8",
31-
"zendframework/zend-i18n": "^2.7.3",
32-
"zendframework/zend-console": "^2.6",
33-
"zendframework/zend-http": "^2.5.4",
26+
"php": "^7.2 || ^8.0",
27+
"laminas/laminas-mvc": "^3.0.1",
28+
"laminas/laminas-loader": "^2.5.1",
29+
"laminas/laminas-modulemanager": "^2.7.2",
30+
"laminas/laminas-config": "^2.6 || ^3.0",
31+
"laminas/laminas-cache": "^2.7.1",
32+
"laminas/laminas-log": "^2.9",
33+
"laminas/laminas-view": "^2.8",
34+
"laminas/laminas-i18n": "^2.7.3",
35+
"laminas/laminas-console": "^2.6",
36+
"laminas/laminas-http": "^2.5.4",
3437
"imagine/imagine": "^0.6 || ^1.0"
3538
},
3639
"require-dev": {
37-
"phpunit/phpunit": "~4.3|~5",
3840
"mikey179/vfsstream": "1.*",
39-
"squizlabs/php_codesniffer": "1.*",
40-
"phploc/phploc": "2.*",
41+
"squizlabs/php_codesniffer": "^3.5",
42+
"phploc/phploc": "^7.0",
4143
"pdepend/pdepend": "2.*",
4244
"phpmd/phpmd": "2.*",
43-
"sebastian/phpcpd": "2.*",
44-
"theseer/phpdox": "0.7.*",
45-
"nikic/php-parser": "<1.2.0",
46-
"zendframework/zend-serializer": "~2.5"
45+
"laminas/laminas-serializer": "~2.5",
46+
"phpunit/phpunit": "^9.5",
47+
"nikic/php-parser": "^4.10",
48+
"sebastian/phpcpd": "^6.0"
4749
},
4850
"autoload": {
49-
"psr-4" : {
50-
"TckImageResizer\\": "TckImageResizer/src/"
51-
},
52-
"classmap": [
53-
"./Module.php"
54-
]
51+
"psr-4": {
52+
"TckImageResizer\\": "./src/"
53+
}
54+
},
55+
"autoload-dev": {
56+
"psr-4": {
57+
"TckImageResizerTest\\": "./tests/TckImageResizerTest/"
58+
}
5559
}
5660
}

0 commit comments

Comments
 (0)