Skip to content

Commit c625498

Browse files
committed
Merge branch 'release/0.9.16'
2 parents 52b2f1f + cba3880 commit c625498

24 files changed

+43
-39
lines changed

.version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"strategy": "semver",
33
"major": 0,
44
"minor": 9,
5-
"patch": 15,
5+
"patch": 16,
66
"build": 0
77
}

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"ext-json": "*",
1616
"neuron-php/application": "0.8.*",
1717
"neuron-php/routing": "0.8.*",
18-
"neuron-php/data": "0.8.*",
1918
"neuron-php/dto": "0.0.*",
2019
"league/commonmark": "^2.6",
2120
"neuron-php/cli": "0.8.*",

src/Bootstrap.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
namespace Neuron\Mvc;
33

44
use Neuron\Core\Exceptions\NotFound;
5-
use Neuron\Data\Filter\Get;
6-
use Neuron\Data\Filter\Server;
7-
use Neuron\Data\Object\Version;
8-
use Neuron\Data\Setting\Source\Yaml;
5+
use Neuron\Data\Filters\Get;
6+
use Neuron\Data\Filters\Server;
7+
use Neuron\Data\Objects\Version;
8+
use Neuron\Data\Settings\Source\Yaml;
99
use Neuron\Patterns\Registry;
1010

1111
/**
@@ -18,7 +18,7 @@
1818

1919
function boot( string $configPath ) : Application
2020
{
21-
/** @var Neuron\Data\Setting\Source\ISettingSource $settings */
21+
/** @var Neuron\Data\Settings\Source\ISettingSource $settings */
2222

2323
try
2424
{
@@ -31,8 +31,7 @@ function boot( string $configPath ) : Application
3131
$basePath = getenv( 'SYSTEM_BASE_PATH' ) ? : '.';
3232
}
3333

34-
$version = new Version();
35-
$version->loadFromFile( "$basePath/.version.json" );
34+
$version = \Neuron\Data\Factories\Version::fromFile( "$basePath/.version.json" );
3635

3736
try
3837
{

src/Mvc/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Neuron\Core\Exceptions\MissingMethod;
99
use Neuron\Core\Exceptions\NotFound;
1010
use Neuron\Core\Exceptions\Validation;
11-
use Neuron\Data\Setting\Source\ISettingSource;
11+
use Neuron\Data\Settings\Source\ISettingSource;
1212
use Neuron\Log\Log;
1313
use Neuron\Mvc\Controllers\Factory;
1414
use Neuron\Mvc\Events\Http404;

src/Mvc/Cache/CacheConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Neuron\Mvc\Cache;
33

4-
use Neuron\Data\Setting\Source\ISettingSource;
4+
use Neuron\Data\Settings\Source\ISettingSource;
55

66
class CacheConfig
77
{

src/Mvc/Cli/Commands/Cache/ClearCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Neuron\Mvc\Cache\Storage\CacheStorageFactory;
77
use Neuron\Mvc\Cache\Storage\ICacheStorage;
88
use Neuron\Mvc\Cache\CacheConfig;
9-
use Neuron\Data\Setting\Source\Yaml;
9+
use Neuron\Data\Settings\Source\Yaml;
1010

1111
/**
1212
* CLI command for clearing the MVC view cache.

src/Mvc/Cli/Commands/Cache/StatsCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Neuron\Cli\Commands\Command;
66
use Neuron\Mvc\Cache\Storage\FileCacheStorage;
77
use Neuron\Mvc\Cache\CacheConfig;
8-
use Neuron\Data\Setting\Source\Yaml;
8+
use Neuron\Data\Settings\Source\Yaml;
99

1010
/**
1111
* CLI command for displaying MVC cache statistics.

src/Mvc/Cli/Commands/Migrate/CreateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Neuron\Cli\Commands\Command;
66
use Neuron\Mvc\Database\MigrationManager;
7-
use Neuron\Data\Setting\Source\Yaml;
7+
use Neuron\Data\Settings\Source\Yaml;
88

99
/**
1010
* CLI command for creating a new database migration

src/Mvc/Cli/Commands/Migrate/RollbackCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Neuron\Cli\Commands\Command;
66
use Neuron\Mvc\Database\MigrationManager;
7-
use Neuron\Data\Setting\Source\Yaml;
7+
use Neuron\Data\Settings\Source\Yaml;
88

99
/**
1010
* CLI command for rolling back database migrations

src/Mvc/Cli/Commands/Migrate/RunCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Neuron\Cli\Commands\Command;
66
use Neuron\Mvc\Database\MigrationManager;
7-
use Neuron\Data\Setting\Source\Yaml;
7+
use Neuron\Data\Settings\Source\Yaml;
88

99
/**
1010
* CLI command for running database migrations

0 commit comments

Comments
 (0)