Skip to content

Commit e968c36

Browse files
dp-ifacesoftdp-ifacesoft
committed
some fixes
1 parent 6ac14a0 commit e968c36

35 files changed

+391
-568
lines changed

Diff for: ‎Config/Ice/Core/Module.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
'configDir' => 'Config/',
2828
'sourceDir' => 'Source/',
2929
'resourceDir' => 'Resource/',
30+
'resourceJsDir' => 'Resource/js/',
31+
'resourceCssDir' => 'Resource/css/',
3032
'logDir' => '../_log/Ice/',
3133
'cacheDir' => '../_cache/Ice/',
3234
'uploadDir' => '../_upload/Ice/',
33-
'download' => '../_download/Ice/',
35+
'downloadDir' => '../_download/Ice/',
3436
'compiledResourceDir' => '../_resource/Ice/resource'
3537
],
3638
'vendors' => []

Diff for: ‎Resource/Ice/Action/Module/Create.tpl.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
include fastcgi_params;
6060

6161
fastcgi_buffer_size 128k;
62-
fastcgi_buffers 4 256k;
63-
fastcgi_busy_buffers_size 512k;
62+
fastcgi_buffers 16 64k;
63+
fastcgi_busy_buffers_size 256k;
6464
}
6565

6666
location ~ /\. {
@@ -76,16 +76,16 @@
7676
ServerName <?= strtolower($moduleName) . '.local' ?>
7777
ServerAlias <?= strtolower($moduleName) . '.global' ?> <?= strtolower($moduleName) . '.test' ?>
7878

79-
DocumentRoot <?= Module::getInstance()->getPath() ?>Web
79+
DocumentRoot <?= Module::getInstance()->get('path') ?>Web
8080
DirectoryIndex index.php
8181

82-
Alias /resource/ <?= Module::getInstance()->getCompiledResourceDir() ?>
82+
Alias /resource/ <?= Module::getInstance()->get('compiledResourceDir') ?>
8383

8484

85-
CustomLog <?= Module::getInstance()->getLogDir() ?>access.log combined
86-
ErrorLog <?= Module::getInstance()->getLogDir() ?>error.log
85+
CustomLog <?= Module::getInstance()->get('logDir') ?>access.log combined
86+
ErrorLog <?= Module::getInstance()->get('logDir') ?>error.log
8787

88-
<Directory <?= dirname(Module::getInstance()->getPath()) ?>>
88+
<Directory <?= dirname(Module::getInstance()->get('path')) ?>>
8989
AllowOverride All
9090
Order allow,deny
9191
Allow from All

Diff for: ‎Source/Ice/Action/Module/Create.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -356,16 +356,16 @@ public function run(array $input)
356356
$iceModule = Module::getInstance('Ice');
357357

358358
if ($input['isWeb'] == 'web') {
359-
copy($iceModule->getPath() . 'cli', $moduleDir . 'cli');
359+
copy($iceModule->get('path') . 'cli', $moduleDir . 'cli');
360360
chmod($moduleDir . 'cli', 0755);
361361

362-
copy($iceModule->getPath() . 'app.php', $moduleDir . 'app.php');
362+
copy($iceModule->get('path') . 'app.php', $moduleDir . 'app.php');
363363

364-
Directory::copy(Module::getInstance('Ice')->getResourceDir() . '/web', $moduleDir . 'Web');
364+
Directory::copy(Module::getInstance('Ice')->get('resourceDir') . '/web', $moduleDir . 'Web');
365365

366-
copy($iceModule->getPath() . 'composer.phar', $moduleDir . 'composer.phar');
366+
copy($iceModule->get('path') . 'composer.phar', $moduleDir . 'composer.phar');
367367

368-
$composer = Json::decode(file_get_contents($iceModule->getPath() . 'composer.json'));
368+
$composer = Json::decode(file_get_contents($iceModule->get('path') . 'composer.json'));
369369

370370
$composer['name'] = $moduleName;
371371
$composer['description'] = $moduleName;
@@ -380,8 +380,8 @@ public function run(array $input)
380380
$this->getView()->setTemplate('');
381381
}
382382

383-
copy($iceModule->getPath() . '.gitignore', $moduleDir . '.gitignore');
384-
copy($iceModule->getPath() . '.hgignore', $moduleDir . '.hgignore');
383+
copy($iceModule->get('path') . '.gitignore', $moduleDir . '.gitignore');
384+
copy($iceModule->get('path') . '.hgignore', $moduleDir . '.hgignore');
385385

386386
File::createData($moduleDir . 'Config/Ice/Core/Config.php', $config);
387387
File::createData($moduleDir . 'Config/Ice/Core/Environment.php', $environment);

Diff for: ‎Source/Ice/Action/Phpunit/Run.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@ protected static function config()
9191
*/
9292
public function run(array $input)
9393
{
94-
$modulePath = Module::getInstance()->getPath();
94+
$modulePath = Module::getInstance()->get('path');
95+
96+
foreach (Module::getAll() as $module) {
97+
$path = $module->get('path');
9598

96-
foreach (Module::getPathes() as $path) {
9799
$command = VENDOR_DIR . $input['vendor'] . '/' . $input['script'] .
98100
' --configuration ' . $path . 'Config/vendor/phpunit.xml' .
99101
' --bootstrap ' . $path . 'bootstrap.php';

Diff for: ‎Source/Ice/Action/Resources.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ public function run(array $input)
222222
'css' => []
223223
];
224224

225-
$compiledResourceDir = Module::getInstance()->getCompiledResourceDir();
225+
$compiledResourceDir = Module::getInstance()->get('compiledResourceDir');
226226

227-
foreach (Module::getAliases() as $name) {
228-
$modulePath = Module::getInstance($name)->getPath();
227+
foreach (array_keys(Module::getAll()) as $name) {
228+
$modulePath = Module::getInstance($name)->get('path');
229229
$jsResource = $compiledResourceDir . $name . '/javascript.pack.js';
230230
$cssResource = $compiledResourceDir . $name . '/style.pack.css';
231231

@@ -268,7 +268,7 @@ public function run(array $input)
268268
foreach ($config as $name => $configResources) {
269269
foreach ($configResources as $resourceKey => $resourceItem) {
270270
$source = $from == 'modules' // else from vendors
271-
? Module::getInstance($name)->getPath() . 'Resource/'
271+
? Module::getInstance($name)->get('path') . 'Resource/'
272272
: VENDOR_DIR . $name . '/';
273273

274274
$res = $from == 'modules' // else from vendors
@@ -328,15 +328,15 @@ public function run(array $input)
328328
$callStack = Ice::getContext()->getFullStack();
329329

330330
foreach (array_keys($callStack) as $actionClass) {
331-
if (file_exists($jsSource = Loader::getFilePath($actionClass, '.js', 'Resource/', false))) {
331+
if (file_exists($jsSource = Loader::getFilePath($actionClass, '.js', MODULE::RESOURCE_DIR, false))) {
332332
$resources['js'][] = [
333333
'source' => $jsSource,
334334
'resource' => $jsResource,
335335
'url' => '/resource/' . $jsRes . $jsFile,
336336
'pack' => true
337337
];
338338
}
339-
if (file_exists($cssSource = Loader::getFilePath($actionClass, '.css', 'Resource/', false))) {
339+
if (file_exists($cssSource = Loader::getFilePath($actionClass, '.css', MODULE::RESOURCE_DIR, false))) {
340340
$resources['css'][] = [
341341
'source' => $cssSource,
342342
'resource' => $cssResource,
@@ -357,7 +357,7 @@ public function run(array $input)
357357
foreach ($input['js'] as $resource) {
358358
$resources['js'][] =
359359
[
360-
'source' => Loader::getFilePath($resource, '.js', 'Resource/js/'),
360+
'source' => Loader::getFilePath($resource, '.js', MODULE::RESOURCE_JS_DIR),
361361
'resource' => $jsResource,
362362
'url' => '/resource/' . $jsRes . $jsFile,
363363
'pack' => true
@@ -368,7 +368,7 @@ public function run(array $input)
368368
foreach ($input['css'] as $resource) {
369369
$resources['css'][] =
370370
[
371-
'source' => Loader::getFilePath($resource, '.css', 'Resource/css/'),
371+
'source' => Loader::getFilePath($resource, '.css', MODULE::RESOURCE_CSS_DIR),
372372
'resource' => $cssResource,
373373
'url' => '/resource/' . $cssRes . $cssFile,
374374
'pack' => true,

Diff for: ‎Source/Ice/Bootstrap.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,11 @@ public static function init(ClassLoader $loader, $force = false)
5353
date_default_timezone_set('UTC');
5454

5555
try {
56-
Module::init();
56+
require_once Module::getInstance('Ice')->get('sourceDir') . 'Ice/Core/Data/Provider.php';
57+
require_once Module::getInstance('Ice')->get('sourceDir') . 'Ice/Core/View/Render.php';
5758

58-
require_once Module::getInstance('Ice')->getSourceDir() . 'Ice/Core/Cache/Stored.php';
59-
require_once Module::getInstance('Ice')->getSourceDir() . 'Ice/Core/Data/Provider.php';
60-
require_once Module::getInstance('Ice')->getSourceDir() . 'Ice/Core/View/Render.php';
61-
62-
Environment::init();
63-
Logger::init();
6459
Loader::init($loader, $force);
60+
Logger::init();
6561
Request::init();
6662

6763
if (Request::isOptions()) {

Diff for: ‎Source/Ice/Core/Action.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040
abstract class Action implements Cacheable
4141
{
42-
use Cache_Stored;
42+
use Stored;
4343

4444
/**
4545
* Child Actions

Diff for: ‎Source/Ice/Core/Cache.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class Cache
2626
{
27-
use Cache_Stored;
27+
use Stored;
2828

2929
const VALIDATE = 'validate';
3030
const INVALIDATE = 'invalidate';

Diff for: ‎Source/Ice/Core/Config.php

+8-21
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
class Config
3333
{
34-
use Cache_Stored;
34+
use Stored;
3535

3636
/**
3737
* Config params
@@ -73,7 +73,9 @@ protected function __construct()
7373
*/
7474
public static function create($configName, array $configData)
7575
{
76-
$config = new Config();
76+
$configClass = self::getClass();
77+
78+
$config = new $configClass();
7779

7880
$config->_configName = $configName;
7981
$config->_config = $configData;
@@ -125,7 +127,7 @@ public static function getInstance($class, $postfix = null, $isRequired = false,
125127
}
126128

127129
if ($baseClass != $class) {
128-
foreach (array_reverse(Loader::getFilePath($baseClass, '.php', 'Config/', false, false, false, true)) as $configFilePath) {
130+
foreach (array_reverse(Loader::getFilePath($baseClass, '.php', Module::CONFIG_DIR, false, false, false, true)) as $configFilePath) {
129131
$configFromFile = File::loadData($configFilePath);
130132
if (!is_array($configFromFile)) {
131133
Config::getLogger()->exception(['Не валидный файл конфиг: {$0}', $configFilePath], __FILE__, __LINE__);
@@ -137,7 +139,7 @@ public static function getInstance($class, $postfix = null, $isRequired = false,
137139
}
138140

139141
try {
140-
foreach (array_reverse(Loader::getFilePath($class, '.php', 'Config/', $isRequired, false, false, true)) as $configFilePath) {
142+
foreach (array_reverse(Loader::getFilePath($class, '.php', Module::CONFIG_DIR, $isRequired, false, false, true)) as $configFilePath) {
141143
$configFromFile = File::loadData($configFilePath);
142144
if (!is_array($configFromFile)) {
143145
Config::getLogger()->exception(['Не валидный файл конфиг: {$0}', $configFilePath], __FILE__, __LINE__);
@@ -151,21 +153,6 @@ public static function getInstance($class, $postfix = null, $isRequired = false,
151153
return $repository->set($class, Config::create($class, $config), $ttl);
152154
}
153155

154-
// /**
155-
// * Retuurn default data provider key
156-
// *
157-
// * @return string
158-
// *
159-
// * @author dp <[email protected]>
160-
// *
161-
// * @version 0.0
162-
// * @since 0.0
163-
// */
164-
// protected static function getDefaultDataProviderKey()
165-
// {
166-
// return 'Ice:Registry/' . __CLASS__;
167-
// }
168-
169156
/**
170157
* Get config param values
171158
*
@@ -294,7 +281,7 @@ public function remove($key)
294281
public function backup($revision)
295282
{
296283
File::move(
297-
Loader::getFilePath($this->getConfigName(), '.php', 'Config/', false, true),
284+
Loader::getFilePath($this->getConfigName(), '.php', Module::CONFIG_DIR, false, true),
298285
Loader::getFilePath($this->getConfigName() . '/' . $revision, '.php', 'Var/Backup/Config/', false, true)
299286
);
300287

@@ -313,7 +300,7 @@ public function backup($revision)
313300
*/
314301
public function save()
315302
{
316-
File::createData(Loader::getFilePath($this->getConfigName(), '.php', 'Config/', false, true), $this->_config);
303+
File::createData(Loader::getFilePath($this->getConfigName(), '.php', Module::CONFIG_DIR, false, true), $this->_config);
317304
return $this;
318305
}
319306
}

Diff for: ‎Source/Ice/Core/Data/Source.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
abstract class Data_Source extends Container
3333
{
34-
use Cache_Stored;
34+
use Stored;
3535

3636
/**
3737
* Data source scheme
@@ -377,8 +377,6 @@ public function execute(Query $query, $ttl)
377377
}
378378
} catch (\Exception $e) {
379379
Data_Source::getLogger()->log(['(error) {$0} [{$1}]', [$queryResult, Logger::microtimeResult($startTime) . ' | ' . Memory::memoryGetUsagePeak()]], Logger::DANGER);
380-
Logger::debug($query->getBody(), $query->getBinds());
381-
382380
Data_Source::getLogger()->exception('Data source execute query failed', __FILE__, __LINE__, $e, $query);
383381
}
384382

0 commit comments

Comments
 (0)