Skip to content

Commit

Permalink
Fixed: namespace conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
JanGalek committed Apr 13, 2018
1 parent e2636b6 commit f6a49de
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Galek/Utils/Calendar/Calendar.php
Expand Up @@ -3,7 +3,7 @@

namespace Galek\Utils\Calendar;

use Galek\Utils\Calendar\Configuration\Localization;
use Galek\Utils\Calendar\Configuration\Localization as ConfLocalization;
use Galek\Utils\Calendar\Enum\Country;
use Galek\Utils\Calendar\Validators\HourValidator;
use Galek\Utils\Calendar\Validators\MinuteValidator;
Expand Down Expand Up @@ -31,17 +31,17 @@ class Calendar extends DateTime
/**
* @param string $time [optional]
* @param $object [optional]
* @param $configuration Localization
* @param $configuration ConfLocalization
*/
public function __construct($time = 'now', $object = null, Localization $configuration = null)
public function __construct($time = 'now', $object = null, ConfLocalization $configuration = null)
{
parent::__construct($time, $object);

if (null === $this->date) {
$this->date = new \DateTime();
}

$this->configuration = $configuration ?? new Localization();
$this->configuration = $configuration ?? new ConfLocalization();
}


Expand Down

0 comments on commit f6a49de

Please sign in to comment.