Applied fixes from StyleCI

This commit is contained in:
vijaysebastian
2016-02-29 07:15:40 -05:00
committed by StyleCI Bot
parent 500a2d76f4
commit 56bc64132b
105 changed files with 256 additions and 454 deletions

View File

@@ -11,6 +11,7 @@ use App\Model\helpdesk\Settings\Company;
use App\Model\helpdesk\settings\Email; use App\Model\helpdesk\settings\Email;
use App\Model\helpdesk\Utility\Log_notification; use App\Model\helpdesk\Utility\Log_notification;
use App\User; use App\User;
// classes // classes
/** /**

View File

@@ -3,7 +3,8 @@
namespace App\Http\Controllers\Agent\helpdesk; namespace App\Http\Controllers\Agent\helpdesk;
// controllers // controllers
use App\Http\Controllers\Common\SettingsController;use App\Http\Controllers\Controller; use App\Http\Controllers\Common\SettingsController;
use App\Http\Controllers\Controller;
// requests // requests
// models // models
use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Agent\Department;

View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Agent\kb;
// Controllers // Controllers
use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Agent\helpdesk\TicketController;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
// Requests // Requests
use App\Http\Requests\kb\ArticleRequest; use App\Http\Requests\kb\ArticleRequest;

View File

@@ -6,6 +6,7 @@ namespace App\Http\Controllers\Client\helpdesk;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
// models // models
use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Email\Emails;
// classes // classes
/** /**

View File

@@ -3,6 +3,7 @@
namespace App\Model\helpdesk\Ticket; namespace App\Model\helpdesk\Ticket;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
class Ticket_Thread extends Model class Ticket_Thread extends Model
{ {
protected $table = 'ticket_thread'; protected $table = 'ticket_thread';

View File

@@ -3,6 +3,7 @@
namespace App\Model\helpdesk\Ticket; namespace App\Model\helpdesk\Ticket;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
class Tickets extends Model class Tickets extends Model
{ {
protected $table = 'tickets'; protected $table = 'tickets';

View File

@@ -36,7 +36,7 @@ class AppServiceProvider extends ServiceProvider
\Cron::add('example2', '*/2 * * * *', function () { \Cron::add('example2', '*/2 * * * *', function () {
// Do some crazy things successfully every two minute // Do some crazy things successfully every two minute
return;
}); });
\Cron::add('disabled job', '0 * * * *', function () { \Cron::add('disabled job', '0 * * * *', function () {

View File

@@ -1,4 +1,5 @@
<?php /* <body><pre> <?php
/* <body><pre>
------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------
CKEditor - Posted Data CKEditor - Posted Data

View File

@@ -1213,8 +1213,6 @@ private function is_valid_path($path)
if ($deleteRootToo) { if ($deleteRootToo) {
@rmdir($dir); @rmdir($dir);
} }
return;
} }
/** /**

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
?> ?>
<form style="font-family: Verdana, Tahoma; font-size: 11px"> <form style="font-family: Verdana, Tahoma; font-size: 11px">
<input type="hidden" name="demo" value="<?php echo $activeDemo->name; ?>" /> <input type="hidden" name="demo" value="<?php echo $activeDemo->name; ?>" />

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_addNoise extends Demo class Demo_addNoise extends Demo
{ {
public $order = 9350; public $order = 9350;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_applyConvolution extends Demo class Demo_applyConvolution extends Demo
{ {
public $order = 2025; public $order = 2025;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_applyFilter extends Demo class Demo_applyFilter extends Demo
{ {
public $order = 2000; public $order = 2000;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_applyMask extends Demo class Demo_applyMask extends Demo
{ {
public $order = 600; public $order = 600;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_asGrayscale extends Demo class Demo_asGrayscale extends Demo
{ {
public $order = 300; public $order = 300;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_asNegative extends Demo class Demo_asNegative extends Demo
{ {
public $order = 300; public $order = 300;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_autoCrop extends Demo class Demo_autoCrop extends Demo
{ {
public $order = 1050; public $order = 1050;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_correctGamma extends Demo class Demo_correctGamma extends Demo
{ {
public $order = 2050; public $order = 2050;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_crop extends Demo class Demo_crop extends Demo
{ {
public $order = 1000; public $order = 1000;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_flip extends Demo class Demo_flip extends Demo
{ {
public $order = 1200; public $order = 1200;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_getCanvas extends Demo class Demo_getCanvas extends Demo
{ {
public $order = 1300; public $order = 1300;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_getChannels extends Demo class Demo_getChannels extends Demo
{ {
public $order = 500; public $order = 500;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_getMask extends Demo class Demo_getMask extends Demo
{ {
public $order = 550; public $order = 550;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_merge extends Demo class Demo_merge extends Demo
{ {
public $order = 800; public $order = 800;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_mirror extends Demo class Demo_mirror extends Demo
{ {
public $order = 1150; public $order = 1150;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_resize extends Demo class Demo_resize extends Demo
{ {
public $order = 900; public $order = 900;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_resizeCanvas extends Demo class Demo_resizeCanvas extends Demo
{ {
public $order = 910; public $order = 910;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_rotate extends Demo class Demo_rotate extends Demo
{ {
public $order = 1100; public $order = 1100;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_roundCorners extends Demo class Demo_roundCorners extends Demo
{ {
public $order = 1075; public $order = 1075;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo_unsharp extends Demo class Demo_unsharp extends Demo
{ {
public $order = 1350; public $order = 1350;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class AngleField extends IntField class AngleField extends IntField
{ {
public function __construct($name, $default, $hint = 'In degrees clockwise, negative values accepted') public function __construct($name, $default, $hint = 'In degrees clockwise, negative values accepted')

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class CheckboxField extends Field class CheckboxField extends Field
{ {
public function init($request) public function init($request)

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class CheckboxSetField extends Field class CheckboxSetField extends Field
{ {
public $options; public $options;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class ColorField extends Field class ColorField extends Field
{ {
public function __construct($name, $default, $hint = 'RRGGBB hex, leave blank for transparent background') public function __construct($name, $default, $hint = 'RRGGBB hex, leave blank for transparent background')

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class CoordinateField extends Field class CoordinateField extends Field
{ {
public function __construct($name, $default, $hint = 'Smart coordinate') public function __construct($name, $default, $hint = 'Smart coordinate')

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Demo class Demo
{ {
public $name; public $name;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class Field class Field
{ {
public $name; public $name;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class FileSelectField extends Field class FileSelectField extends Field
{ {
public $request; public $request;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class FloatField extends Field class FloatField extends Field
{ {
public function __construct($name, $default, $hint = 'Float') public function __construct($name, $default, $hint = 'Float')

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class FormatSelectField extends SelectField class FormatSelectField extends SelectField
{ {
public function __construct($name) public function __construct($name)

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class IntField extends Field class IntField extends Field
{ {
public function __construct($name, $default, $hint = 'Integer') public function __construct($name, $default, $hint = 'Integer')

View File

@@ -2,9 +2,6 @@
/** /**
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
**/ **/
/**
*/
class Request class Request
{ {
protected $vars = []; protected $vars = [];

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
class SelectField extends Field class SelectField extends Field
{ {
public $options; public $options;

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
define('DEMO_PATH', realpath(dirname(__FILE__).DIRECTORY_SEPARATOR.'..').DIRECTORY_SEPARATOR); define('DEMO_PATH', realpath(dirname(__FILE__).DIRECTORY_SEPARATOR.'..').DIRECTORY_SEPARATOR);
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);

View File

@@ -1,6 +1,5 @@
<?php <?php
/**
*/
require_once dirname(__FILE__).'/helpers/common.php'; require_once dirname(__FILE__).'/helpers/common.php';
require_once dirname(__FILE__).'/../lib/WideImage.php'; require_once dirname(__FILE__).'/../lib/WideImage.php';

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
include 'helpers/common.php'; include 'helpers/common.php';
require_once '../lib/WideImage.php'; require_once '../lib/WideImage.php';

View File

@@ -3,27 +3,18 @@
* @author Gasper Kozak * @author Gasper Kozak
* @copyright 2007-2011 * @copyright 2007-2011
**/ **/
/**
*/
class WideImage_NoFontException extends WideImage_Exception class WideImage_NoFontException extends WideImage_Exception
{ {
} }
/**
*/
class WideImage_InvalidFontFileException extends WideImage_Exception class WideImage_InvalidFontFileException extends WideImage_Exception
{ {
} }
/**
*/
class WideImage_InvalidCanvasMethodException extends WideImage_Exception class WideImage_InvalidCanvasMethodException extends WideImage_Exception
{ {
} }
/**
*/
class WideImage_Canvas class WideImage_Canvas
{ {
protected $handle = 0; protected $handle = 0;

View File

@@ -3,9 +3,6 @@
* @author Gasper Kozak * @author Gasper Kozak
* @copyright 2007-2011 * @copyright 2007-2011
**/ **/
/**
*/
class WideImage_InvalidCoordinateException extends WideImage_Exception class WideImage_InvalidCoordinateException extends WideImage_Exception
{ {
} }

View File

@@ -3,9 +3,6 @@
* @author Gasper Kozak * @author Gasper Kozak
* @copyright 2007-2011 * @copyright 2007-2011
**/ **/
/**
*/
class WideImage_UnknownImageOperationException extends WideImage_Exception class WideImage_UnknownImageOperationException extends WideImage_Exception
{ {
} }

View File

@@ -3,9 +3,6 @@
* @author Gasper Kozak * @author Gasper Kozak
* @copyright 2007-2011 * @copyright 2007-2011
**/ **/
/**
*/
class WideImage_PaletteImage extends WideImage_Image class WideImage_PaletteImage extends WideImage_Image
{ {
/** /**

View File

@@ -18,20 +18,14 @@
require_once WideImage::path().'Font/GDF.php'; require_once WideImage::path().'Font/GDF.php';
require_once WideImage::path().'Font/PS.php'; require_once WideImage::path().'Font/PS.php';
/**
*/
class WideImage_InvalidImageHandleException extends WideImage_Exception class WideImage_InvalidImageHandleException extends WideImage_Exception
{ {
} }
/**
*/
class WideImage_InvalidImageSourceException extends WideImage_Exception class WideImage_InvalidImageSourceException extends WideImage_Exception
{ {
} }
/**
*/
class WideImage_GDFunctionResultException extends WideImage_Exception class WideImage_GDFunctionResultException extends WideImage_Exception
{ {
} }

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Canvas_Test extends WideImage_TestCase class WideImage_Canvas_Test extends WideImage_TestCase
{ {
public function testCreate() public function testCreate()

View File

@@ -2,9 +2,6 @@
/** /**
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
**/ **/
/**
*/
class WideImage_Coordinate_Test extends WideImage_TestCase class WideImage_Coordinate_Test extends WideImage_TestCase
{ {
public function testEvaluate() public function testEvaluate()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_CustomOp class WideImage_Operation_CustomOp
{ {
public static $args = null; public static $args = null;
@@ -17,8 +13,6 @@
} }
} }
/**
*/
class ImageForOutput extends WideImage_TrueColorImage class ImageForOutput extends WideImage_TrueColorImage
{ {
public $headers = []; public $headers = [];
@@ -29,8 +23,6 @@
} }
} }
/**
*/
class TestableImage extends WideImage_TrueColorImage class TestableImage extends WideImage_TrueColorImage
{ {
public $headers = []; public $headers = [];
@@ -45,8 +37,6 @@
} }
} }
/**
*/
class WideImage_Image_Test extends WideImage_TestCase class WideImage_Image_Test extends WideImage_TestCase
{ {
public function testFactories() public function testFactories()

View File

@@ -1,11 +1,7 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/BMP.php'; include WideImage::path().'Mapper/BMP.php';
/**
*/
class WideImage_Mapper_BMP_Test extends WideImage_TestCase class WideImage_Mapper_BMP_Test extends WideImage_TestCase
{ {
/** /**

View File

@@ -1,11 +1,7 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/GD2.php'; include WideImage::path().'Mapper/GD2.php';
/**
*/
class WideImage_Mapper_GD2_Test extends WideImage_TestCase class WideImage_Mapper_GD2_Test extends WideImage_TestCase
{ {
protected $mapper; protected $mapper;

View File

@@ -1,11 +1,7 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/GD.php'; include WideImage::path().'Mapper/GD.php';
/**
*/
class WideImage_Mapper_GD_Test extends WideImage_TestCase class WideImage_Mapper_GD_Test extends WideImage_TestCase
{ {
/** /**

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/GIF.php'; include WideImage::path().'Mapper/GIF.php';
/** /**

View File

@@ -1,11 +1,7 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/JPEG.php'; include WideImage::path().'Mapper/JPEG.php';
/**
*/
class WideImage_Mapper_JPEG_Test extends WideImage_TestCase class WideImage_Mapper_JPEG_Test extends WideImage_TestCase
{ {
protected $mapper; protected $mapper;

View File

@@ -1,11 +1,7 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/PNG.php'; include WideImage::path().'Mapper/PNG.php';
/**
*/
class WideImage_Mapper_PNG_Test extends WideImage_TestCase class WideImage_Mapper_PNG_Test extends WideImage_TestCase
{ {
protected $mapper; protected $mapper;

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
include WideImage::path().'Mapper/TGA.php'; include WideImage::path().'Mapper/TGA.php';
/** /**

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_MapperFactory_Test extends WideImage_TestCase class WideImage_MapperFactory_Test extends WideImage_TestCase
{ {
public function testMapperPNGByURI() public function testMapperPNGByURI()

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
/** /**
* @group operation * @group operation

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
/** /**
* @group operation * @group operation

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_ApplyMask_Test extends WideImage_TestCase class WideImage_Operation_ApplyMask_Test extends WideImage_TestCase
{ {
public function testApplyMask() public function testApplyMask()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_AsGrayscale_Test extends WideImage_TestCase class WideImage_Operation_AsGrayscale_Test extends WideImage_TestCase
{ {
public function skip() public function skip()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_AsNegativeTest extends WideImage_TestCase class WideImage_Operation_AsNegativeTest extends WideImage_TestCase
{ {
public function skip() public function skip()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_Autocrop_Test extends WideImage_TestCase class WideImage_Operation_Autocrop_Test extends WideImage_TestCase
{ {
public function testAutocrop() public function testAutocrop()

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
/** /**
* @group operation * @group operation

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_Crop_Test extends WideImage_TestCase class WideImage_Operation_Crop_Test extends WideImage_TestCase
{ {
public function testCropTransparentGif() public function testCropTransparentGif()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class FlipTest extends WideImage_TestCase class FlipTest extends WideImage_TestCase
{ {
public function testFlip() public function testFlip()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_GetChannels_Test extends WideImage_TestCase class WideImage_Operation_GetChannels_Test extends WideImage_TestCase
{ {
public function testCopyChannel8bit() public function testCopyChannel8bit()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_GetMask_Test extends WideImage_TestCase class WideImage_Operation_GetMask_Test extends WideImage_TestCase
{ {
public function testGetMaskTransparentGif() public function testGetMaskTransparentGif()

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
/** /**
* @group operation * @group operation

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_Mirror_Test extends WideImage_TestCase class WideImage_Operation_Mirror_Test extends WideImage_TestCase
{ {
public function testMirror() public function testMirror()

View File

@@ -1,11 +1,7 @@
<?php <?php
/**
**/
WideImage_OperationFactory::get('ResizeCanvas'); WideImage_OperationFactory::get('ResizeCanvas');
/**
*/
class WideImage_Operation_ResizeCanvas_Test extends WideImage_TestCase class WideImage_Operation_ResizeCanvas_Test extends WideImage_TestCase
{ {
public function testResizeCanvasUp() public function testResizeCanvasUp()

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
WideImage_OperationFactory::get('Resize'); WideImage_OperationFactory::get('Resize');
class WideImage_Operation_Resize_Testable extends WideImage_Operation_Resize class WideImage_Operation_Resize_Testable extends WideImage_Operation_Resize
@@ -12,8 +10,6 @@
} }
} }
/**
*/
class WideImage_Operation_Resize_Test extends WideImage_TestCase class WideImage_Operation_Resize_Test extends WideImage_TestCase
{ {
public function testProxyMethod() public function testProxyMethod()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_Rotate_Test extends WideImage_TestCase class WideImage_Operation_Rotate_Test extends WideImage_TestCase
{ {
public function skip() public function skip()

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
/** /**
* @group operation * @group operation

View File

@@ -1,7 +1,5 @@
<?php <?php
/**
**/
/** /**
* @group operation * @group operation

View File

@@ -1,16 +1,10 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Operation_MyOperation class WideImage_Operation_MyOperation
{ {
} }
/**
*/
class WideImage_OperationFactory_Test extends WideImage_TestCase class WideImage_OperationFactory_Test extends WideImage_TestCase
{ {
public function testFactoryReturnsCached() public function testFactoryReturnsCached()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_PaletteImage_Test extends WideImage_TestCase class WideImage_PaletteImage_Test extends WideImage_TestCase
{ {
public function testCreate() public function testCreate()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_TrueColorImage_Test extends WideImage_TestCase class WideImage_TrueColorImage_Test extends WideImage_TestCase
{ {
public function testCreate() public function testCreate()

View File

@@ -1,10 +1,6 @@
<?php <?php
/**
**/
/**
*/
class WideImage_Mapper_FOO class WideImage_Mapper_FOO
{ {
public static $calls = []; public static $calls = [];
@@ -71,8 +67,6 @@
} }
} }
/**
*/
class WideImage_Test extends WideImage_TestCase class WideImage_Test extends WideImage_TestCase
{ {
protected $_FILES; protected $_FILES;

View File

@@ -67,9 +67,6 @@
* @author Eric "EJ" Johnson <ej@racklabs.com> * @author Eric "EJ" Johnson <ej@racklabs.com>
* @copyright Copyright (c) 2008, Rackspace US, Inc. * @copyright Copyright (c) 2008, Rackspace US, Inc.
*/ */
/**
*/
require_once 'cloudfiles_exceptions.php'; require_once 'cloudfiles_exceptions.php';
require 'cloudfiles_http.php'; require 'cloudfiles_http.php';
define('DEFAULT_CF_API_VERSION', 1); define('DEFAULT_CF_API_VERSION', 1);
@@ -1819,8 +1816,6 @@ class CF_Object
if ($this->container->cdn_enabled) { if ($this->container->cdn_enabled) {
return $this->container->cdn_uri.'/'.$this->name; return $this->container->cdn_uri.'/'.$this->name;
} }
return;
} }
/** /**

View File

@@ -23,9 +23,6 @@
* @author Eric "EJ" Johnson <ej@racklabs.com> * @author Eric "EJ" Johnson <ej@racklabs.com>
* @copyright Copyright (c) 2008, Rackspace US, Inc. * @copyright Copyright (c) 2008, Rackspace US, Inc.
*/ */
/**
*/
require_once 'cloudfiles_exceptions.php'; require_once 'cloudfiles_exceptions.php';
define('PHP_CF_VERSION', '1.7.7'); define('PHP_CF_VERSION', '1.7.7');
@@ -172,8 +169,6 @@ class CF_Http
throw new IOException('Could not use CA bundle: ' throw new IOException('Could not use CA bundle: '
.$this->cabundle_path); .$this->cabundle_path);
} }
return;
} }
// Uses separate cURL connection to authenticate // Uses separate cURL connection to authenticate
@@ -1320,8 +1315,6 @@ class CF_Http
curl_setopt($ch, CURLOPT_NOBODY, 1); curl_setopt($ch, CURLOPT_NOBODY, 1);
} }
$this->connections[$conn_type] = $ch; $this->connections[$conn_type] = $ch;
return;
} }
private function _reset_callback_vars() private function _reset_callback_vars()