Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix Migration Class Warning Generation #1877

Merged
merged 5 commits into from
Jun 26, 2024
Merged

Fix Migration Class Warning Generation #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
572a550
Reducing PHP Warnings
ryanrath Jun 25, 2024
755f256
This is what I get for working from memory
ryanrath Jun 25, 2024
5ece791
fixing stuff
ryanrath Jun 25, 2024
3dfd099
restoring original content
ryanrath Jun 25, 2024
7dd5fda
restructuring fix
ryanrath Jun 26, 2024
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
4 changes: 2 additions & 2 deletions classes/OpenXdmod/Migration/ConfigFilesMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ protected function writeJsonConfigFile($name, array $data)
$file = implode(
DIRECTORY_SEPARATOR,
array(
$this->config->getBaseDir(),
CONFIG_DIR,
"$name.json"
)
);
Expand Down Expand Up @@ -249,7 +249,7 @@ protected function assertJsonConfigIsWritable($name)
$file = implode(
DIRECTORY_SEPARATOR,
array(
$this->config->getBaseDir(),
CONFIG_DIR,
"$name.json"
)
);
Expand Down
15 changes: 0 additions & 15 deletions classes/OpenXdmod/Migration/Migration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ abstract class Migration
*/
protected $newVersion;

/**
* An empty default Configuration object.
*
* @var Configuration
*/
protected $config;

/**
* Logger object.
*
Expand All @@ -53,15 +46,7 @@ public function __construct($currentVersion, $newVersion)
$this->currentVersion = $currentVersion;
$this->newVersion = $newVersion;


$this->logger = Log::singleton('null');

$this->config = Configuration::factory(
".",
CONFIG_DIR,
$this->logger
);

}

/**
Expand Down