Skip to content

Commit

Permalink
Merge pull request #20 from acelaya-forks/feature/laminas
Browse files Browse the repository at this point in the history
Migrated project from Zend to Laminas
  • Loading branch information
acelaya authored Jan 3, 2020
2 parents a90d836 + 7bc1a66 commit c1b0664
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).

## [Unreleased]
## 1.3.0 - 2020-01-03

#### Added

Expand All @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
#### Changed

* [#15](https://github.com/shlinkio/shlink-ip-geolocation/issues/15) Updated coding-standard (v2.1) and phpstan (0.12) dependencies.
* [#16](https://github.com/shlinkio/shlink-ip-geolocation/issues/16) Migrated from Zend Framework components to [Laminas](https://getlaminas.org/).

#### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Shlink module with tools to geolocate an IP address using different strategies.

Most of the elements it provides require a [PSR-11](https://www.php-fig.org/psr/psr-11/) container, and it's easy to integrate on [expressive](https://github.com/zendframework/zend-expressive) applications thanks to the `ConfigProvider` it includes.
Most of the elements it provides require a [PSR-11](https://www.php-fig.org/psr/psr-11/) container, and it's easy to integrate on [mezzio](https://github.com/mezzio/mezzio) applications thanks to the `ConfigProvider` it includes.

[![Build Status](https://img.shields.io/travis/shlinkio/shlink-ip-geolocation.svg?style=flat-square)](https://travis-ci.org/shlinkio/shlink-ip-geolocation)
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink-ip-geolocation.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink-ip-geolocation/?branch=master)
Expand Down
4 changes: 2 additions & 2 deletions config/dependencies.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

use GeoIp2\Database\Reader;
use GuzzleHttp\Client as GuzzleClient;
use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
use Laminas\ServiceManager\Factory\InvokableFactory;
use Symfony\Component\Filesystem\Filesystem;
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
use Zend\ServiceManager\Factory\InvokableFactory;

return [

Expand Down
4 changes: 2 additions & 2 deletions config/geolite2.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace Shlinkio\Shlink\IpGeolocation;

use GeoIp2\Database\Reader;
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
use Zend\ServiceManager\Proxy\LazyServiceFactory;
use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
use Laminas\ServiceManager\Proxy\LazyServiceFactory;

return [

Expand Down
2 changes: 1 addition & 1 deletion src/GeoLite2/GeoLite2Options.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Shlinkio\Shlink\IpGeolocation\GeoLite2;

use Zend\Stdlib\AbstractOptions;
use Laminas\Stdlib\AbstractOptions;

class GeoLite2Options extends AbstractOptions
{
Expand Down
2 changes: 1 addition & 1 deletion test/ConfigProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace ShlinkioTest\Shlink\IpGeolocation;

use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
use PHPUnit\Framework\TestCase;
use Shlinkio\Shlink\IpGeolocation\ConfigProvider;
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;

class ConfigProviderTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion test/GeoLite2/DbUpdaterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use GuzzleHttp\ClientInterface;
use GuzzleHttp\Exception\ClientException;
use Laminas\Diactoros\Response;
use PHPUnit\Framework\TestCase;
use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy;
Expand All @@ -14,7 +15,6 @@
use Shlinkio\Shlink\IpGeolocation\GeoLite2\GeoLite2Options;
use Symfony\Component\Filesystem\Exception as FilesystemException;
use Symfony\Component\Filesystem\Filesystem;
use Zend\Diactoros\Response;

class DbUpdaterTest extends TestCase
{
Expand Down

0 comments on commit c1b0664

Please sign in to comment.