Skip to content

Commit 6191ba2

Browse files
authored
Merge pull request #1 from apphp/dev
Dev Merge to Prod
2 parents 1fd90ca + 6781d6a commit 6191ba2

File tree

147 files changed

+13538
-10772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+13538
-10772
lines changed

CHANGELOG

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1+
Version 1.4.x -
2+
----------------------------
3+
- New: added new helper CSecureHeaders with possibility to define secure headers
4+
- Enh: added possibility to hide system queries in debug panel
5+
- Enh: added possibility to close debug panel to minimum size
6+
- Enh: added possibility to get records by chunks with chuck() method of Active Record
7+
- Bug: fixed wrong assignment of _isRendered in CView
8+
9+
110
Version 1.3.2 - 24 Jan, 2020
211
----------------------------
312
- New: added CRecordEntity to ORM model
4-
- New: added phpunit tests
13+
- New: added PHPUnit tests
514
- Enh: added possibility to use create() and update() methods in CActiveRecord
615
- Enh: changes in components CHttpRequest
716
- Enh: minor changes in database migrations
@@ -13,7 +22,7 @@ Version 1.3.2 - 24 Jan, 2020
1322
- Enh: added possibility for lazy loading of core components via config
1423
- Enh: fixed wrong path of log file in CLogger component
1524
- Bug: fixed PHP7 syntax requirements in TCPDF vendor, CValidator helper
16-
- Bug: fixed overwriting existing vars in View rendeting
25+
- Bug: fixed overwriting existing vars in View rendering
1726

1827

1928
Version 1.2.2 - 01 Jan, 2019

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<p align="center">
55
<a href="https://github.com/apphp/php-mvc-framework"><img src="https://github.com/apphp/php-mvc-framework/workflows/build/badge.svg" alt="Build Status"></a>
66
<a href="https://opensource.org/licenses/lgpl-3.0.html"><img src="http://apphpframework.com/images/badges/license.svg" alt="License LGPL"></a>
7-
<a href="http://apphpframework.com/"><img src="http://apphpframework.com/images/badges/stable.svg" alt="Stable Version"></a>
7+
<a href="http://apphpframework.com"><img src="http://apphpframework.com/images/badges/stable.svg" alt="Stable Version"></a>
8+
<a href="http://apphpframework.com"><img src="https://apphp.com/images/badges/fw-downloads.svg" alt="Total Downloads"></a>
89
</p>
910

1011
## About ApPHP Framework
@@ -96,4 +97,4 @@ Please visit the project website for tutorials, class reference and join discuss
9697

9798
- [Official Website](http://www.apphpframework.com)
9899
- [Website](https://www.apphp.com/php-framework/)
99-
- [GitHub Repository](https://github.com/apphp/php-mvc-framework)
100+
- [GitHub Repository](https://github.com/apphp/php-mvc-framework)

bin/aii

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env php
2+
<?php
3+
/**
4+
* ApPHP command line script for Unix/Linux.
5+
*
6+
* This is the bootstrap script for running aii on Unix/Linux.
7+
*
8+
* @project ApPHP Framework
9+
* @author ApPHP <[email protected]>
10+
* @link http://www.apphpframework.com/
11+
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
12+
* @license http://www.apphpframework.com/license/
13+
*/
14+
15+
require_once(dirname(__FILE__).'/aii.php');

bin/aii.bat

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@echo off
2+
3+
rem -------------------------------------------------------------
4+
rem Aii command line script for Windows.
5+
rem
6+
rem This is the bootstrap script for running aii on Windows.
7+
rem
8+
rem @project ApPHP Framework
9+
rem @author ApPHP <[email protected]>
10+
rem @link http://www.apphpframework.com/
11+
rem @copyright Copyright (c) 2012 - 2020 ApPHP Framework
12+
rem @license http://www.apphpframework.com/license/
13+
rem -------------------------------------------------------------
14+
15+
@setlocal
16+
17+
set APPHP_PATH=%~dp0
18+
19+
if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
20+
21+
"%PHP_COMMAND%" "%APPHP_PATH%aii" %*
22+
23+
@endlocal

bin/aii.php

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
// Change the following paths if necessary
4+
defined('APPHP_PATH') || define('APPHP_PATH', dirname(__FILE__));
5+
// Directory separator
6+
defined('DS') || define('DS', DIRECTORY_SEPARATOR);
7+
// Console mode only
8+
defined('APPHP_MODE') or define('APPHP_MODE', 'console');
9+
10+
11+
$apphp = dirname(__FILE__) . '/../framework/Apphp.php';
12+
$config = APPHP_PATH . '/protected/config/';
13+
14+
require_once($apphp);
15+
A::init($config)->run();
16+
17+
// We get automatically $argv and $argc, as we run command line command
18+
$console = new CConsole($argv);
19+
$consoleCommand = new CConsoleCommand(
20+
$console->getCommand(),
21+
$console->getParams()
22+
);
23+
$consoleCommand->run();

0 commit comments

Comments
 (0)