use intval() instead of floor() for int return type

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index d3d5b310026416a6875a80caf38b6f062e9de0e6..0a5f79e763136a6616eeb97a36b5651bf1af3fe8 100644 (file)
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -369,7 +369,7 @@ class AvatarsettingsAction extends SettingsAction
         $dest_y = $this->arg('avatar_crop_y') ? $this->arg('avatar_crop_y'):0;
         $dest_w = $this->arg('avatar_crop_w') ? $this->arg('avatar_crop_w'):$file_d;
         $dest_h = $this->arg('avatar_crop_h') ? $this->arg('avatar_crop_h'):$file_d;
-        $size = floor(min($dest_w, $dest_h, MAX_ORIGINAL));
+        $size = intval(min($dest_w, $dest_h, MAX_ORIGINAL));
 
         $user = common_current_user();
         $profile = $user->getProfile();

diff --git a/classes/Avatar.php b/classes/Avatar.php
index 02874b902b5f267e8f94e6e742981c884cb4c07c..55abc81b33b3850891b6c3ca6ca80ceddd3efdfd 100644 (file)
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -90,8 +90,8 @@ class Avatar extends Managed_DataObject
      */
     public static function byProfile(Profile $target, $width=null, $height=null)
     {
-        $width  = (int) floor($width);
-        $height = !is_null($height) ? (int) floor($height) : null;
+        $width  = intval($width);
+        $height = !is_null($height) ? intval($height) : null;
         if (is_null($height)) {
             $height = $width;
         }
@@ -236,7 +236,7 @@ class Avatar extends Managed_DataObject
     }
 
     static function newSize(Profile $target, $width) {
-        $width = (int) floor($width);
+        $width = intval($width);
         if ($width < 1 || $width > common_config('avatar', 'maxsize')) {
             // TRANS: An error message when avatar size is unreasonable
             throw new Exception(_m('Avatar size too large'));