Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit f2be183

Browse files
authored
Merge pull request #3 from apphp/dev
Prepare new version changes
2 parents 1f87a5e + befae5d commit f2be183

Some content is hidden

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

90 files changed

+96
-134
lines changed

‎UPDATE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ General update instructions
1414
- Check if everything is OK, if not - revert from backup and post issues to ApPHP issue tracker.
1515

1616

17+
Updating from 1.3.2 to 1.4.1
18+
------------------------------
19+
- general update instructions
20+
1721
Updating from 1.2.2 to 1.3.2
1822
------------------------------
1923
- general update instructions

‎bin/aii

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @project ApPHP Framework
99
* @author ApPHP <info@apphp.com>
1010
* @link http://www.apphpframework.com/
11-
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
11+
* @copyright Copyright (c) 2012 - 2021 ApPHP Framework
1212
* @license http://www.apphpframework.com/license/
1313
*/
1414

‎bin/aii.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rem
88
rem @project ApPHP Framework
99
rem @author ApPHP <info@apphp.com>
1010
rem @link http://www.apphpframework.com/
11-
rem @copyright Copyright (c) 2012 - 2020 ApPHP Framework
11+
rem @copyright Copyright (c) 2012 - 2021 ApPHP Framework
1212
rem @license http://www.apphpframework.com/license/
1313
rem -------------------------------------------------------------
1414

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"php": ">=7.1.0"
2828
},
2929
"require-dev": {
30-
"phpunit/phpunit": "^7.5"
30+
"phpunit/phpunit": "^7.0"
3131
},
3232
"autoload": {
3333
"psr-4": {

‎demos/hello-world/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @project ApPHP Framework
66
* @author ApPHP <info@apphp.com>
77
* @link http://www.apphpframework.com/
8-
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
8+
* @copyright Copyright (c) 2012 - 2021 ApPHP Framework
99
* @license http://www.apphpframework.com/license/
1010
*/
1111

‎demos/login-system/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @project ApPHP Framework
66
* @author ApPHP <info@apphp.com>
77
* @link http://www.apphpframework.com/
8-
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
8+
* @copyright Copyright (c) 2012 - 2021 ApPHP Framework
99
* @license http://www.apphpframework.com/license/
1010
*/
1111

@@ -14,7 +14,7 @@
1414
// directory separator
1515
defined('DS') || define('DS', DIRECTORY_SEPARATOR);
1616
// production | debug | demo | test
17-
defined('APPHP_MODE') or define('APPHP_MODE', 'debug');
17+
defined('APPHP_MODE') or define('APPHP_MODE', 'production');
1818

1919

2020
$apphp = dirname(__FILE__) . '/../../framework/Apphp.php';

‎demos/simple-blog/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @project ApPHP Framework
66
* @author ApPHP <info@apphp.com>
77
* @link http://www.apphpframework.com/
8-
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
8+
* @copyright Copyright (c) 2012 - 2021 ApPHP Framework
99
* @license http://www.apphpframework.com/license/
1010
*/
1111

@@ -14,7 +14,7 @@
1414
// directory separator
1515
defined('DS') || define('DS', DIRECTORY_SEPARATOR);
1616
// production | debug | demo | test
17-
defined('APPHP_MODE') or define('APPHP_MODE', 'debug');
17+
defined('APPHP_MODE') or define('APPHP_MODE', 'production');
1818

1919

2020
$apphp = dirname(__FILE__) . '/../../framework/Apphp.php';

‎demos/simple-cms/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @project ApPHP Framework
66
* @author ApPHP <info@apphp.com>
77
* @link http://www.apphpframework.com/
8-
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
8+
* @copyright Copyright (c) 2012 - 2021 ApPHP Framework
99
* @license http://www.apphpframework.com/license/
1010
*/
1111

‎demos/static-site/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @project ApPHP Framework
66
* @author ApPHP <info@apphp.com>
77
* @link http://www.apphpframework.com/
8-
* @copyright Copyright (c) 2012 - 2020 ApPHP Framework
8+
* @copyright Copyright (c) 2012 - 2021 ApPHP Framework
99
* @license http://www.apphpframework.com/license/
1010
*/
1111

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
[22-Aug-2020 19:45:03 UTC] PHP Fatal error: Uncaught Error: Class 'CSecureHeaders' not found in C:\xampp\htdocs\git\php-mvc-framework\framework\core\CView.php:655
2-
Stack trace:
3-
#0 C:\xampp\htdocs\git\php-mvc-framework\framework\core\CView.php(346): CView->_renderHeaders()
4-
#1 C:\xampp\htdocs\git\php-mvc-framework\demos\static-site\protected\controllers\IndexController.php(24): CView->render('index/index')
5-
#2 C:\xampp\htdocs\git\php-mvc-framework\framework\core\CController.php(49): IndexController->indexAction()
6-
#3 C:\xampp\htdocs\git\php-mvc-framework\framework\core\CRouter.php(232): CController->execute('indexAction', Array)
7-
#4 C:\xampp\htdocs\git\php-mvc-framework\framework\Apphp.php(575): CRouter->route()
8-
#5 C:\xampp\htdocs\git\php-mvc-framework\framework\Apphp.php(321): A->_runApp()
9-
#6 C:\xampp\htdocs\git\php-mvc-framework\demos\static-site\index.php(24): A->run()
10-
#7 {main}
11-
thrown in C:\xampp\htdocs\git\php-mvc-framework\framework\core\CView.php on line 655
1+

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /