Tweaks and fixes

This commit is contained in:
Graham Campbell 2015-01-02 00:53:23 +00:00
parent 0ccb5e289c
commit ef98408a42
8 changed files with 12 additions and 6 deletions

4
.gitattributes vendored
View File

@ -1,8 +1,10 @@
* text=auto
/docs export-ignore
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/phpunit.xml export-ignore
/README.md export-ignore
/CONTRIBUTING.md export-ignore
/INSTALL.md export-ignore
/README.md export-ignore

View File

@ -71,4 +71,4 @@ App::down(function () {
|
*/
require app_path('view-composers.php');
require app_path('composers.php');

View File

@ -78,6 +78,8 @@ class Incident extends Model implements TransformableInterface
return 'ion ion-eye';
case 4:
return 'ion ion-checkmark';
default:
return '';
}
}

View File

@ -3,7 +3,7 @@
namespace CachetHQ\Cachet\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Str;
use Illuminate\Support\Str;
use Watson\Validating\ValidatingTrait;
class IncidentTemplate extends Model

View File

@ -2,6 +2,7 @@
namespace CachetHQ\Cachet\Models;
use ErrorException;
use Illuminate\Database\Eloquent\Model;
class Setting extends Model

View File

@ -2,6 +2,7 @@
namespace CachetHQ\Cachet\Models;
use Exception;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\ClientException;
use Illuminate\Database\Eloquent\Builder;
@ -52,11 +53,11 @@ class WebHook extends Model
* Fires the actual web hook event.
*
* @param string $eventType The event to send X-Cachet-Event
* @param mixed $data Data to send to the Web Hook
* @param string $data Data to send to the Web Hook
*
* @return \CachetHQ\Cachet\Models\WebHookResponse
*/
public function fire($eventType, $data = null)
public function fire($eventType, $data)
{
$startTime = microtime(true);

View File

@ -14,7 +14,7 @@ if (!function_exists('elixir')) {
{
static $manifest = null;
if (is_null($manifest)) {
if ($manifest === null) {
$manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true);
}