From c06cb80fd117f0004595bd228f383d21e1c26181 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Fri, 21 Nov 2014 19:17:48 +0100 Subject: [PATCH] renamed parameter --- src/Intervention/Image/Commands/CircleCommand.php | 4 ++-- src/Intervention/Image/Gd/Shapes/CircleShape.php | 14 +++++++------- .../Image/Imagick/Shapes/CircleShape.php | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Intervention/Image/Commands/CircleCommand.php b/src/Intervention/Image/Commands/CircleCommand.php index b99cab09..993b5673 100644 --- a/src/Intervention/Image/Commands/CircleCommand.php +++ b/src/Intervention/Image/Commands/CircleCommand.php @@ -14,7 +14,7 @@ class CircleCommand extends \Intervention\Image\Commands\AbstractCommand */ public function execute($image) { - $radius = $this->argument(0)->type('numeric')->required()->value(); + $diameter = $this->argument(0)->type('numeric')->required()->value(); $x = $this->argument(1)->type('numeric')->required()->value(); $y = $this->argument(2)->type('numeric')->required()->value(); $callback = $this->argument(3)->type('closure')->value(); @@ -22,7 +22,7 @@ class CircleCommand extends \Intervention\Image\Commands\AbstractCommand $circle_classname = sprintf('\Intervention\Image\%s\Shapes\CircleShape', $image->getDriver()->getDriverName()); - $circle = new $circle_classname($radius); + $circle = new $circle_classname($diameter); if ($callback instanceof Closure) { $callback($circle); diff --git a/src/Intervention/Image/Gd/Shapes/CircleShape.php b/src/Intervention/Image/Gd/Shapes/CircleShape.php index 15b606e2..f1315d34 100644 --- a/src/Intervention/Image/Gd/Shapes/CircleShape.php +++ b/src/Intervention/Image/Gd/Shapes/CircleShape.php @@ -7,22 +7,22 @@ use \Intervention\Image\Image; class CircleShape extends EllipseShape { /** - * Radius of circle in pixels + * Diameter of circle in pixels * * @var integer */ - public $radius = 100; + public $diameter = 100; /** * Create new instance of circle * - * @param integer $radius + * @param integer $diameter */ - public function __construct($radius = null) + public function __construct($diameter = null) { - $this->width = is_numeric($radius) ? intval($radius) : $this->radius; - $this->height = is_numeric($radius) ? intval($radius) : $this->radius; - $this->radius = is_numeric($radius) ? intval($radius) : $this->radius; + $this->width = is_numeric($diameter) ? intval($diameter) : $this->diameter; + $this->height = is_numeric($diameter) ? intval($diameter) : $this->diameter; + $this->diameter = is_numeric($diameter) ? intval($diameter) : $this->diameter; } /** diff --git a/src/Intervention/Image/Imagick/Shapes/CircleShape.php b/src/Intervention/Image/Imagick/Shapes/CircleShape.php index 9416c40f..2aa67c02 100644 --- a/src/Intervention/Image/Imagick/Shapes/CircleShape.php +++ b/src/Intervention/Image/Imagick/Shapes/CircleShape.php @@ -7,22 +7,22 @@ use \Intervention\Image\Image; class CircleShape extends EllipseShape { /** - * Radius of circle in pixels + * Diameter of circle in pixels * * @var integer */ - public $radius = 100; + public $diameter = 100; /** * Create new instance of circle * - * @param integer $radius + * @param integer $diameter */ - public function __construct($radius = null) + public function __construct($diameter = null) { - $this->width = is_numeric($radius) ? intval($radius) : $this->radius; - $this->height = is_numeric($radius) ? intval($radius) : $this->radius; - $this->radius = is_numeric($radius) ? intval($radius) : $this->radius; + $this->width = is_numeric($diameter) ? intval($diameter) : $this->diameter; + $this->height = is_numeric($diameter) ? intval($diameter) : $this->diameter; + $this->diameter = is_numeric($diameter) ? intval($diameter) : $this->diameter; } /**