Skip to content

Commit

Permalink
Merge pull request #3 from Triangle-org/v6
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
localzet authored Jul 29, 2024
2 parents 50d01e1 + c87b924 commit 89b7e78
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .idea/Web.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"require": {
"php": "^8.2",
"triangle/engine": "^6.1"
"triangle/engine": "^6.3"
},
"suggest": {
"ext-simplexml": "For XML Support",
Expand Down
31 changes: 31 additions & 0 deletions config/console.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

$base_path = defined('BASE_PATH') ? BASE_PATH : (Composer\InstalledVersions::getRootPackage()['install_path'] ?? null);

return [
'enable' => true,

'build' => [
// Для PHAR
'input_dir' => $base_path,
'output_dir' => $base_path . DIRECTORY_SEPARATOR . 'build',

'exclude_pattern' => '#^(?!.*(composer.json|/.github/|/.idea/|/.git/|/.setting/|/runtime/|/vendor-bin/|/build/))(.*)$#',
'exclude_files' => [
'.env', 'LICENSE', 'composer.json', 'composer.lock', 'triangle.phar', 'triangle'
],

'phar_alias' => 'triangle',
'phar_filename' => 'triangle.phar',
'phar_stub' => 'master', // Файл для require. Относительный путь, от корня `input_dir`

'signature_algorithm' => Phar::SHA256, // Phar::MD5, Phar::SHA1, Phar::SHA256, Phar::SHA512, Phar::OPENSSL.
'private_key_file' => '', // Для Phar::OPENSSL

// Для бинарной сборки:
'php_version' => 8.3,
'php_ini' => 'memory_limit = 256M',

'bin_filename' => 'triangle',
],
];
6 changes: 6 additions & 0 deletions config/route.php
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<?php

use Triangle\Router;

Router::any('/hello/{name}', function (support\Request $request, string $name) {
return response("Привет, $name!");
});
2 changes: 1 addition & 1 deletion master
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if (!in_array($argv[1] ?? '', ['start', 'restart', 'stop', 'status', 'reload', '
$paths[] = $path;
}
}
Triangle\Engine\Router::load($paths);
Triangle\Router::load($paths);
} else {
Triangle\Engine\Environment::loadAll(run_path());
Triangle\Engine\Config::load(config_path(), ['route', 'container']);
Expand Down
2 changes: 1 addition & 1 deletion support/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
use Triangle\Engine\Environment;
use Triangle\Engine\Http\Request;
use Triangle\Engine\Path;
use Triangle\Engine\Router;
use Triangle\Engine\View\Blade;
use Triangle\Engine\View\Raw;
use Triangle\Engine\View\ThinkPHP;
use Triangle\Engine\View\Twig;
use Triangle\Router;
use Twig\Error\LoaderError;
use Twig\Error\RuntimeError;
use Twig\Error\SyntaxError;
Expand Down

0 comments on commit 89b7e78

Please sign in to comment.