Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 15, 2012
Miodrag Tokić Minor code formatting 6c97e25
Miodrag Tokić Added PHPUnit bootstrap files 6664ade
Miodrag Tokić Merge branch '3.1/master' into 3.2/master 32bdff8
Showing with 126 additions and 3 deletions.
  1. +9 −3 index.php
  2. +105 −0 phpunit.php
  3. +12 −0 phpunit.xml
View
12 index.php
@@ -56,17 +56,23 @@
// Set the full path to the docroot
define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
-// Make the application relative to the docroot, for symlink'd index.php
if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
+{
+ // Make the application relative to the docroot
$application = DOCROOT.$application;
+}
-// Make the modules relative to the docroot, for symlink'd index.php
if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
+{
+ // Make the modules relative to the docroot
$modules = DOCROOT.$modules;
+}
-// Make the system relative to the docroot, for symlink'd index.php
if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
+{
+ // Make the system relative to the docroot
$system = DOCROOT.$system;
+}
// Define the absolute paths for configured directories
define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
View
105 phpunit.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * The directory in which your application specific resources are located.
+ * The application directory must contain the bootstrap.php file.
+ *
+ * @see http://kohanaframework.org/guide/about.install#application
+ */
+$application = 'application';
+
+/**
+ * The directory in which your modules are located.
+ *
+ * @see http://kohanaframework.org/guide/about.install#modules
+ */
+$modules = 'modules';
+
+/**
+ * The directory in which the Kohana resources are located. The system
+ * directory must contain the classes/kohana.php file.
+ *
+ * @see http://kohanaframework.org/guide/about.install#system
+ */
+$system = 'system';
+
+/**
+ * The default extension of resource files. If you change this, all resources
+ * must be renamed to use the new extension.
+ *
+ * @see http://kohanaframework.org/guide/about.install#ext
+ */
+define('EXT', '.php');
+
+/**
+ * Set the PHP error reporting level. If you set this in php.ini, you remove this.
+ * @see http://php.net/error_reporting
+ *
+ * When developing your application, it is highly recommended to enable notices
+ * and strict warnings. Enable them by using: E_ALL | E_STRICT
+ *
+ * In a production environment, it is safe to ignore notices and strict warnings.
+ * Disable them by using: E_ALL ^ E_NOTICE
+ *
+ * When using a legacy application with PHP >= 5.3, it is recommended to disable
+ * deprecated notices. Disable with: E_ALL & ~E_DEPRECATED
+ */
+error_reporting(E_ALL | E_STRICT);
+
+/**
+ * End of standard configuration! Changing any of the code below should only be
+ * attempted by those with a working knowledge of Kohana internals.
+ *
+ * @see http://kohanaframework.org/guide/using.configuration
+ */
+
+// Set the full path to the docroot
+define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
+
+if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
+{
+ // Make the application relative to the docroot
+ $application = DOCROOT.$application;
+}
+
+if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
+{
+ // Make the modules relative to the docroot
+ $modules = DOCROOT.$modules;
+}
+
+if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
+{
+ // Make the system relative to the docroot
+ $system = DOCROOT.$system;
+}
+
+// Define the absolute paths for configured directories
+define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
+define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR);
+define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
+
+// Clean up the configuration vars
+unset($application, $modules, $system);
+
+/**
+ * Define the start time of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_TIME'))
+{
+ define('KOHANA_START_TIME', microtime(TRUE));
+}
+
+/**
+ * Define the memory usage at the start of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_MEMORY'))
+{
+ define('KOHANA_START_MEMORY', memory_get_usage());
+}
+
+// Bootstrap the application
+require APPPATH.'bootstrap'.EXT;
+
+// Disable output buffering
+ob_end_flush();
View
12 phpunit.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<phpunit
+ colors="true"
+ bootstrap="phpunit.php"
+>
+ <testsuites>
+ <testsuite name="Sample Suite 1">
+ <directory>application/tests/project_name/suite</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>

No commit comments for this range

Something went wrong with that request. Please try again.