Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
## Version 1 to 2
***

* The namespace has been migrated from `Sparks\Settings` to `CodeIgniter\Settings`; any references will need to be updated.
* Due to the addition of contexts the `BaseHandler` abstract class was changed. Update any handlers that extend this class to include the new and changed methods.
* The main library (`Settings`) now requires a Settings config for the constructor (this is supplied by the Service); update any direct calls to the library constructor.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"autoload": {
"psr-4": {
"Sparks\\Settings\\": "src"
"CodeIgniter\\Settings\\": "src"
},
"exclude-from-classmap": [
"**/Database/Migrations/**"
Expand Down
6 changes: 3 additions & 3 deletions src/Config/Services.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Sparks\Settings\Config;
namespace CodeIgniter\Settings\Config;

use CodeIgniter\Config\BaseService;
use Sparks\Settings\Config\Settings as SettingsConfig;
use Sparks\Settings\Settings;
use CodeIgniter\Settings\Config\Settings as SettingsConfig;
use CodeIgniter\Settings\Settings;

/**
* Services Configuration file.
Expand Down
4 changes: 2 additions & 2 deletions src/Config/Settings.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Sparks\Settings\Config;
namespace CodeIgniter\Settings\Config;

use Sparks\Settings\Handlers\DatabaseHandler;
use CodeIgniter\Settings\Handlers\DatabaseHandler;

class Settings
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Sparks\Settings\Database\Migrations;
namespace CodeIgniter\Settings\Database\Migrations;

use CodeIgniter\Database\Migration;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Sparks\Settings\Database\Migrations;
namespace CodeIgniter\Settings\Database\Migrations;

use CodeIgniter\Database\Migration;

Expand Down
2 changes: 1 addition & 1 deletion src/Handlers/BaseHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Sparks\Settings\Handlers;
namespace CodeIgniter\Settings\Handlers;

use RuntimeException;

Expand Down
2 changes: 1 addition & 1 deletion src/Handlers/DatabaseHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Sparks\Settings\Handlers;
namespace CodeIgniter\Settings\Handlers;

use CodeIgniter\I18n\Time;
use RuntimeException;
Expand Down
4 changes: 2 additions & 2 deletions src/Settings.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Sparks\Settings;
namespace CodeIgniter\Settings;

use CodeIgniter\Settings\Config\Settings as SettingsConfig;
use InvalidArgumentException;
use RuntimeException;
use Sparks\Settings\Config\Settings as SettingsConfig;

/**
* Allows developers a single location to store and
Expand Down
2 changes: 1 addition & 1 deletion tests/HelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace CodeIgniter4\Tests;

use CodeIgniter\I18n\Time;
use CodeIgniter\Settings\Settings;
use CodeIgniter\Test\DatabaseTestTrait;
use Sparks\Settings\Settings;
use Tests\Support\TestCase;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/SettingsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Tests;

use CodeIgniter\I18n\Time;
use CodeIgniter\Settings\Settings;
use CodeIgniter\Test\DatabaseTestTrait;
use Sparks\Settings\Settings;
use Tests\Support\TestCase;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/_support/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ abstract class TestCase extends CIUnitTestCase
{
use Expeditable;

protected $namespace = 'Sparks\Settings';
protected $namespace = 'CodeIgniter\Settings';
protected $refresh = true;

/**
Expand Down