This commit is contained in:
Joseph Cohen
2015-03-20 18:32:24 -06:00
parent b4ac66d727
commit 1ca9b85389
21 changed files with 881 additions and 888 deletions

View File

@@ -2,11 +2,11 @@
namespace CachetHQ\Cachet\Http\Controllers\Admin; namespace CachetHQ\Cachet\Http\Controllers\Admin;
use CachetHQ\Cachet\Controllers\AbstractController;
use CachetHQ\Cachet\Models\Setting; use CachetHQ\Cachet\Models\Setting;
use CachetHQ\Cachet\Models\User; use CachetHQ\Cachet\Models\User;
use Exception; use Exception;
use GrahamCampbell\Binput\Facades\Binput; use GrahamCampbell\Binput\Facades\Binput;
use CachetHQ\Cachet\Controllers\AbstractController;
use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;

View File

@@ -29,7 +29,6 @@ require __DIR__.'/../vendor/autoload.php';
$compiledPath = __DIR__.'/../vendor/compiled.php'; $compiledPath = __DIR__.'/../vendor/compiled.php';
if (file_exists($compiledPath)) if (file_exists($compiledPath)) {
{
require $compiledPath; require $compiledPath;
} }

View File

@@ -29,11 +29,11 @@ return [
'stores' => [ 'stores' => [
'apc' => [ 'apc' => [
'driver' => 'apc' 'driver' => 'apc',
], ],
'array' => [ 'array' => [
'driver' => 'array' 'driver' => 'array',
], ],
'database' => [ 'database' => [
@@ -51,7 +51,7 @@ return [
'driver' => 'memcached', 'driver' => 'memcached',
'servers' => [ 'servers' => [
[ [
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
], ],
], ],
], ],

View File

@@ -63,7 +63,7 @@ return [
'container' => 'your-container', 'container' => 'your-container',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => 'IAD', 'region' => 'IAD',
'url_type' => 'publicURL' 'url_type' => 'publicURL',
], ],
], ],

View File

@@ -57,5 +57,5 @@ return [
\Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST', \Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
\Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO', \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
\Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT', \Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
] ],
]; ];

View File

@@ -14,7 +14,7 @@ return [
*/ */
'paths' => [ 'paths' => [
realpath(base_path('resources/views')) realpath(base_path('resources/views')),
], ],
/* /*

View File

@@ -1,8 +1,7 @@
<?php <?php
/** /**
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans.
* *
* @package Laravel
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
*/ */

View File

@@ -1,11 +1,9 @@
<?php <?php
/** /**
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans.
* *
* @package Laravel
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
*/ */
$uri = urldecode( $uri = urldecode(
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
); );
@@ -13,8 +11,7 @@ $uri = urldecode(
// This file allows us to emulate Apache's "mod_rewrite" functionality from the // This file allows us to emulate Apache's "mod_rewrite" functionality from the
// built-in PHP web server. This provides a convenient way to test a Laravel // built-in PHP web server. This provides a convenient way to test a Laravel
// application without having installed a "real" web server software here. // application without having installed a "real" web server software here.
if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
{
return false; return false;
} }

View File

@@ -1,7 +1,7 @@
<?php <?php
class ExampleTest extends TestCase { class ExampleTest extends TestCase
{
/** /**
* A basic functional test example. * A basic functional test example.
* *
@@ -13,5 +13,4 @@ class ExampleTest extends TestCase {
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode());
} }
} }

View File

@@ -1,7 +1,7 @@
<?php <?php
class TestCase extends Illuminate\Foundation\Testing\TestCase { class TestCase extends Illuminate\Foundation\Testing\TestCase
{
/** /**
* Creates the application. * Creates the application.
* *
@@ -15,5 +15,4 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase {
return $app; return $app;
} }
} }