Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-11 14:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

array loading changed

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-04-02 16:56:11 +02:00
parent 3f5d562af9
commit 0b77a3811b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Module/InstallerAbstract.php
View File

@ -53,12 +53,12 @@ class InstallerAbstract
private static function installRoutes(string $appRoutePath, string $moduleRoutePath) private static function installRoutes(string $appRoutePath, string $moduleRoutePath)
{ {
if(file_exists($appRoutePath) && file_exists($moduleRoutePath)) { if(file_exists($appRoutePath) && file_exists($moduleRoutePath)) {
include $appRoutePath; $appRoutes = include $appRoutePath;
include $moduleRoutePath; $moduleRoutes = include $moduleRoutePath;
$appRoutes = array_merge_recursive($appRoutes, $moduleRoutes); $appRoutes = array_merge_recursive($appRoutes, $moduleRoutes);
if(is_writable($appRoutePath)) { if(is_writable($appRoutePath)) {
file_put_contents(ArrayParser::createFile('moduleRoutes', $appRoutes), $appRoutePath); file_put_contents('<?php return ' . ArrayParser::serializeArray($appRoutes), $appRoutePath);
} else { } else {
throw new PermissionException($appRoutePath); throw new PermissionException($appRoutePath);
} }

3
Router/Router.php
View File

@ -52,8 +52,7 @@ class Router
public function importFromFile(string $path) public function importFromFile(string $path)
{ {
include $path; $this->routes = include $path;
$this->routes = $appRoutes;
} }
/** /**