Browse Source

Revert "Used ternary operator instead of "or" for constant definition"

This reverts commit 2bb6f13505.
tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
386979d6a3
  1. 8
      apps/advanced/backend/tests/_bootstrap.php
  2. 8
      apps/advanced/backend/tests/_console.php
  3. 4
      apps/advanced/backend/tests/acceptance/yii
  4. 4
      apps/advanced/backend/tests/functional/yii
  5. 4
      apps/advanced/backend/tests/unit/yii
  6. 8
      apps/advanced/common/tests/_bootstrap.php
  7. 8
      apps/advanced/common/tests/_console.php
  8. 4
      apps/advanced/common/tests/unit/yii
  9. 8
      apps/advanced/console/tests/_bootstrap.php
  10. 8
      apps/advanced/console/tests/_console.php
  11. 4
      apps/advanced/console/tests/unit/yii
  12. 4
      apps/advanced/environments/dev/backend/web/index-test.php
  13. 4
      apps/advanced/environments/dev/backend/web/index.php
  14. 4
      apps/advanced/environments/dev/frontend/web/index-test.php
  15. 4
      apps/advanced/environments/dev/frontend/web/index.php
  16. 8
      apps/advanced/environments/dev/yii
  17. 4
      apps/advanced/environments/prod/backend/web/index.php
  18. 4
      apps/advanced/environments/prod/frontend/web/index.php
  19. 8
      apps/advanced/environments/prod/yii
  20. 8
      apps/advanced/frontend/tests/_bootstrap.php
  21. 8
      apps/advanced/frontend/tests/_console.php
  22. 4
      apps/advanced/frontend/tests/acceptance/yii
  23. 4
      apps/advanced/frontend/tests/functional/yii
  24. 4
      apps/advanced/frontend/tests/unit/yii
  25. 8
      apps/basic/tests/_bootstrap.php
  26. 8
      apps/basic/tests/_console_bootstrap.php
  27. 4
      apps/basic/web/index-test.php
  28. 4
      apps/basic/web/index.php
  29. 6
      apps/basic/yii
  30. 2
      apps/benchmark/index.php
  31. 4
      build/build
  32. 4
      docs/guide/configuration.md
  33. 6
      docs/guide/console.md
  34. 2
      docs/guide/module-debug.md
  35. 2
      docs/guide/performance.md
  36. 2
      extensions/apidoc/apidoc
  37. 16
      framework/BaseYii.php
  38. 6
      framework/yii

8
apps/advanced/backend/tests/_bootstrap.php

@ -2,14 +2,14 @@
// the entry script URL (without host info) for functional and acceptance tests // the entry script URL (without host info) for functional and acceptance tests
// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/backend/web/index-test.php'); defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/backend/web/index-test.php');
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php'); defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');

8
apps/advanced/backend/tests/_console.php

@ -8,12 +8,12 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');
require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
require_once(__DIR__ . '/../../common/config/aliases.php'); require_once(__DIR__ . '/../../common/config/aliases.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');

4
apps/advanced/backend/tests/acceptance/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

4
apps/advanced/backend/tests/functional/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

4
apps/advanced/backend/tests/unit/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

8
apps/advanced/common/tests/_bootstrap.php

@ -2,14 +2,14 @@
// the entry script URL (without host info) for functional and acceptance tests // the entry script URL (without host info) for functional and acceptance tests
// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/index-test.php'); defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/index-test.php');
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/index-test.php'); defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/index-test.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');

8
apps/advanced/common/tests/_console.php

@ -8,12 +8,12 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');
require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
require_once(__DIR__ . '/../../common/config/aliases.php'); require_once(__DIR__ . '/../../common/config/aliases.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');

4
apps/advanced/common/tests/unit/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

8
apps/advanced/console/tests/_bootstrap.php

@ -2,14 +2,14 @@
// the entry script URL (without host info) for functional and acceptance tests // the entry script URL (without host info) for functional and acceptance tests
// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/index-test.php'); defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/index-test.php');
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/index-test.php'); defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/index-test.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');

8
apps/advanced/console/tests/_console.php

@ -8,12 +8,12 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');
require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
require_once(__DIR__ . '/../../common/config/aliases.php'); require_once(__DIR__ . '/../../common/config/aliases.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');

4
apps/advanced/console/tests/unit/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

4
apps/advanced/environments/dev/backend/web/index-test.php

@ -5,8 +5,8 @@ if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
die('You are not allowed to access this file.'); die('You are not allowed to access this file.');
} }
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');

4
apps/advanced/environments/dev/backend/web/index.php

@ -1,6 +1,6 @@
<?php <?php
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'dev'); defined('YII_ENV') or define('YII_ENV', 'dev');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');

4
apps/advanced/environments/dev/frontend/web/index-test.php

@ -5,8 +5,8 @@ if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
die('You are not allowed to access this file.'); die('You are not allowed to access this file.');
} }
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');

4
apps/advanced/environments/dev/frontend/web/index.php

@ -1,6 +1,6 @@
<?php <?php
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'dev'); defined('YII_ENV') or define('YII_ENV', 'dev');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');

8
apps/advanced/environments/dev/yii

@ -8,12 +8,12 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'dev'); defined('YII_ENV') or define('YII_ENV', 'dev');
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');

4
apps/advanced/environments/prod/backend/web/index.php

@ -1,6 +1,6 @@
<?php <?php
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
defined('YII_ENV') ?: define('YII_ENV', 'prod'); defined('YII_ENV') or define('YII_ENV', 'prod');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');

4
apps/advanced/environments/prod/frontend/web/index.php

@ -1,6 +1,6 @@
<?php <?php
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
defined('YII_ENV') ?: define('YII_ENV', 'prod'); defined('YII_ENV') or define('YII_ENV', 'prod');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');

8
apps/advanced/environments/prod/yii

@ -8,12 +8,12 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
defined('YII_ENV') ?: define('YII_ENV', 'prod'); defined('YII_ENV') or define('YII_ENV', 'prod');
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');

8
apps/advanced/frontend/tests/_bootstrap.php

@ -2,14 +2,14 @@
// the entry script URL (without host info) for functional and acceptance tests // the entry script URL (without host info) for functional and acceptance tests
// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/frontend/web/index-test.php'); defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/frontend/web/index-test.php');
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php'); defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');

8
apps/advanced/frontend/tests/_console.php

@ -8,12 +8,12 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../../vendor/autoload.php'); require_once(__DIR__ . '/../../vendor/autoload.php');
require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
require_once(__DIR__ . '/../../common/config/aliases.php'); require_once(__DIR__ . '/../../common/config/aliases.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');

4
apps/advanced/frontend/tests/acceptance/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

4
apps/advanced/frontend/tests/functional/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

4
apps/advanced/frontend/tests/unit/yii

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require_once(__DIR__ . '/../_console.php'); require_once(__DIR__ . '/../_console.php');

8
apps/basic/tests/_bootstrap.php

@ -2,14 +2,14 @@
// the entry script URL (without host info) for functional and acceptance tests // the entry script URL (without host info) for functional and acceptance tests
// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/basic/web/index-test.php'); defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/basic/web/index-test.php');
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php'); defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require_once(__DIR__ . '/../vendor/autoload.php'); require_once(__DIR__ . '/../vendor/autoload.php');

8
apps/basic/tests/_console_bootstrap.php

@ -1,12 +1,12 @@
<?php <?php
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/../vendor/autoload.php'); require(__DIR__ . '/../vendor/autoload.php');
require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');

4
apps/basic/web/index-test.php

@ -5,8 +5,8 @@ if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
die('You are not allowed to access this file.'); die('You are not allowed to access this file.');
} }
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
require(__DIR__ . '/../vendor/autoload.php'); require(__DIR__ . '/../vendor/autoload.php');
require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');

4
apps/basic/web/index.php

@ -1,8 +1,8 @@
<?php <?php
// comment out the following two lines when deployed to production // comment out the following two lines when deployed to production
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') ?: define('YII_ENV', 'dev'); defined('YII_ENV') or define('YII_ENV', 'dev');
require(__DIR__ . '/../vendor/autoload.php'); require(__DIR__ . '/../vendor/autoload.php');
require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');

6
apps/basic/yii

@ -8,11 +8,11 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');

2
apps/benchmark/index.php

@ -1,6 +1,6 @@
<?php <?php
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
require(__DIR__ . '/protected/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/protected/vendor/yiisoft/yii2/Yii.php');

4
build/build

@ -9,8 +9,8 @@
*/ */
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
define('YII_DEBUG', true); define('YII_DEBUG', true);

4
docs/guide/configuration.md

@ -24,14 +24,14 @@ Like any resource in your Yii application, the bootstrap file can be edited to f
The default bootstrap structure sets `YII_DEBUG` to `false` if not defined: The default bootstrap structure sets `YII_DEBUG` to `false` if not defined:
```php ```php
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
``` ```
During development, you can change this to `true`: During development, you can change this to `true`:
```php ```php
define('YII_DEBUG', true); // Development only define('YII_DEBUG', true); // Development only
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
``` ```
Configuring the application instance Configuring the application instance

6
docs/guide/console.md

@ -40,11 +40,11 @@ code like the following:
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');

2
docs/guide/module-debug.md

@ -76,7 +76,7 @@ return [
By default it's automatically set to `3` if Yii is run in debug mode i.e. your `index.php` file contains the following: By default it's automatically set to `3` if Yii is run in debug mode i.e. your `index.php` file contains the following:
```php ```php
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
``` ```
> Note: Make sure to disable debug mode on production since it may have significan performance effect and expose sensible > Note: Make sure to disable debug mode on production since it may have significan performance effect and expose sensible

2
docs/guide/performance.md

@ -28,7 +28,7 @@ is to disable debug mode. A Yii application runs in debug mode if the constant
should be in your `index.php`: should be in your `index.php`:
```php ```php
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
``` ```
Debug mode is very useful during development stage, but it would impact performance Debug mode is very useful during development stage, but it would impact performance

2
extensions/apidoc/apidoc

@ -8,7 +8,7 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
$composerAutoload = [ $composerAutoload = [
__DIR__ . '/vendor/autoload.php', // standalone with "composer install" run __DIR__ . '/vendor/autoload.php', // standalone with "composer install" run

16
framework/BaseYii.php

@ -14,37 +14,37 @@ use yii\log\Logger;
/** /**
* Gets the application start timestamp. * Gets the application start timestamp.
*/ */
defined('YII_BEGIN_TIME') ?: define('YII_BEGIN_TIME', microtime(true)); defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true));
/** /**
* This constant defines the framework installation directory. * This constant defines the framework installation directory.
*/ */
defined('YII_PATH') ?: define('YII_PATH', __DIR__); defined('YII_PATH') or define('YII_PATH', __DIR__);
/** /**
* This constant defines whether the application should be in debug mode or not. Defaults to false. * This constant defines whether the application should be in debug mode or not. Defaults to false.
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', false); defined('YII_DEBUG') or define('YII_DEBUG', false);
/** /**
* This constant defines in which environment the application is running. Defaults to 'prod', meaning production environment. * This constant defines in which environment the application is running. Defaults to 'prod', meaning production environment.
* You may define this constant in the bootstrap script. The value could be 'prod' (production), 'dev' (development), 'test', 'staging', etc. * You may define this constant in the bootstrap script. The value could be 'prod' (production), 'dev' (development), 'test', 'staging', etc.
*/ */
defined('YII_ENV') ?: define('YII_ENV', 'prod'); defined('YII_ENV') or define('YII_ENV', 'prod');
/** /**
* Whether the the application is running in production environment * Whether the the application is running in production environment
*/ */
defined('YII_ENV_PROD') ?: define('YII_ENV_PROD', YII_ENV === 'prod'); defined('YII_ENV_PROD') or define('YII_ENV_PROD', YII_ENV === 'prod');
/** /**
* Whether the the application is running in development environment * Whether the the application is running in development environment
*/ */
defined('YII_ENV_DEV') ?: define('YII_ENV_DEV', YII_ENV === 'dev'); defined('YII_ENV_DEV') or define('YII_ENV_DEV', YII_ENV === 'dev');
/** /**
* Whether the the application is running in testing environment * Whether the the application is running in testing environment
*/ */
defined('YII_ENV_TEST') ?: define('YII_ENV_TEST', YII_ENV === 'test'); defined('YII_ENV_TEST') or define('YII_ENV_TEST', YII_ENV === 'test');
/** /**
* This constant defines whether error handling should be enabled. Defaults to true. * This constant defines whether error handling should be enabled. Defaults to true.
*/ */
defined('YII_ENABLE_ERROR_HANDLER') ?: define('YII_ENABLE_ERROR_HANDLER', true); defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER', true);
/** /**

6
framework/yii

@ -8,11 +8,11 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
defined('YII_DEBUG') ?: define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
// fcgi doesn't have STDIN and STDOUT defined by default // fcgi doesn't have STDIN and STDOUT defined by default
defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/Yii.php'); require(__DIR__ . '/Yii.php');

Loading…
Cancel
Save