Fixed merge conflicts

This commit is contained in:
Alejandro Celaya 2019-12-23 11:13:32 +01:00
commit 34d8b396a4
3 changed files with 27 additions and 2 deletions

View File

@ -41,6 +41,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
* [#570](https://github.com/shlinkio/shlink/issues/570) Fixed shlink version generated for docker images when building from `develop` branch.
## 1.20.3 - 2019-12-23
#### Added
* *Nothing*
#### Changed
* *Nothing*
#### Deprecated
* *Nothing*
#### Removed
* *Nothing*
#### Fixed
* [#585](https://github.com/shlinkio/shlink/issues/585) Fixed `PHP Fatal error: Uncaught Error: Class 'Shlinkio\Shlink\LocalLockFactory' not found` happening when running some CLI commands.
## 1.20.2 - 2019-12-06
#### Added

View File

@ -8,9 +8,7 @@ use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
use Symfony\Component\Lock;
use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
// This class alias tricks the ConfigAbstractFactory to return Lock\Factory instances even with a different service name
$localLockFactory = 'Shlinkio\Shlink\LocalLockFactory';
class_alias(Lock\LockFactory::class, $localLockFactory);
return [

View File

@ -2,12 +2,16 @@
declare(strict_types=1);
use Symfony\Component\Lock;
use Zend\ServiceManager\ServiceManager;
chdir(dirname(__DIR__));
require 'vendor/autoload.php';
// This class alias tricks the ConfigAbstractFactory to return Lock\Factory instances even with a different service name
class_alias(Lock\LockFactory::class, 'Shlinkio\Shlink\LocalLockFactory');
// Build container
$config = require __DIR__ . '/config.php';
$container = new ServiceManager($config['dependencies']);