diff --git a/library/Zend/Amf/Parse/Amf0/Deserializer.php b/library/Zend/Amf/Parse/Amf0/Deserializer.php index 68b68874e0..78e43c8960 100644 --- a/library/Zend/Amf/Parse/Amf0/Deserializer.php +++ b/library/Zend/Amf/Parse/Amf0/Deserializer.php @@ -78,7 +78,7 @@ public function readTypeMarker($typeMarker = null) // boolean case Zend_Amf_Constants::AMF0_BOOLEAN: - return (boolean) $this->_stream->readByte(); + return (bool) $this->_stream->readByte(); // string case Zend_Amf_Constants::AMF0_STRING: diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php index 8ef9304d1c..030aca3ae3 100644 --- a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php +++ b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php @@ -421,10 +421,10 @@ public function monitorInstance($id, $metric, $options = null) break; case Zend_Cloud_Infrastructure_Instance::MONITOR_RAM: if (preg_match('/(\d+)k total/', $output,$match)) { - $total = (integer) $match[1]; + $total = (int) $match[1]; } if (preg_match('/(\d+)k used/', $output,$match)) { - $used = (integer) $match[1]; + $used = (int) $match[1]; } if ($total>0) { $usage= (float) $used/$total; diff --git a/library/Zend/Config.php b/library/Zend/Config.php index f0480aac43..f53ca6756f 100644 --- a/library/Zend/Config.php +++ b/library/Zend/Config.php @@ -104,7 +104,7 @@ class Zend_Config implements Countable, Iterator */ public function __construct(array $array, $allowModifications = false) { - $this->_allowModifications = (boolean) $allowModifications; + $this->_allowModifications = (bool) $allowModifications; $this->_loadedSection = null; $this->_index = 0; $this->_data = []; diff --git a/library/Zend/Db/Adapter/Mysqli.php b/library/Zend/Db/Adapter/Mysqli.php index c66d19c126..857765bdc7 100644 --- a/library/Zend/Db/Adapter/Mysqli.php +++ b/library/Zend/Db/Adapter/Mysqli.php @@ -292,7 +292,7 @@ protected function _connect() } if (isset($this->_config['port'])) { - $port = (integer) $this->_config['port']; + $port = (int) $this->_config['port']; } else { $port = null; } diff --git a/library/Zend/Db/Adapter/Sqlsrv.php b/library/Zend/Db/Adapter/Sqlsrv.php index 5e13fbcdbf..c7d9000ee3 100644 --- a/library/Zend/Db/Adapter/Sqlsrv.php +++ b/library/Zend/Db/Adapter/Sqlsrv.php @@ -127,7 +127,7 @@ protected function _connect() $serverName = $this->_config['host']; if (isset($this->_config['port'])) { - $port = (integer) $this->_config['port']; + $port = (int) $this->_config['port']; $serverName .= ', ' . $port; } diff --git a/library/Zend/Db/Profiler.php b/library/Zend/Db/Profiler.php index 5049ae311d..2a6d17bda3 100644 --- a/library/Zend/Db/Profiler.php +++ b/library/Zend/Db/Profiler.php @@ -135,7 +135,7 @@ public function __construct($enabled = false) */ public function setEnabled($enable) { - $this->_enabled = (boolean) $enable; + $this->_enabled = (bool) $enable; return $this; } @@ -165,7 +165,7 @@ public function setFilterElapsedSecs($minimumSeconds = null) if (null === $minimumSeconds) { $this->_filterElapsedSecs = null; } else { - $this->_filterElapsedSecs = (integer) $minimumSeconds; + $this->_filterElapsedSecs = (int) $minimumSeconds; } return $this; diff --git a/library/Zend/File/Transfer.php b/library/Zend/File/Transfer.php index c492b7011c..ca46733d44 100644 --- a/library/Zend/File/Transfer.php +++ b/library/Zend/File/Transfer.php @@ -72,7 +72,7 @@ public function setAdapter($adapter, $direction = false, $options = []) Zend_Loader::loadClass($adapter); } - $direction = (integer) $direction; + $direction = (int) $direction; $this->_adapter[$direction] = new $adapter($options); if (!$this->_adapter[$direction] instanceof Zend_File_Transfer_Adapter_Abstract) { require_once 'Zend/File/Transfer/Exception.php'; @@ -96,7 +96,7 @@ public function getAdapter($direction = null) return $this->_adapter; } - $direction = (integer) $direction; + $direction = (int) $direction; return $this->_adapter[$direction]; } @@ -110,7 +110,7 @@ public function getAdapter($direction = null) public function __call($method, array $options) { if (array_key_exists('direction', $options)) { - $direction = (integer) $options['direction']; + $direction = (int) $options['direction']; } else { $direction = 0; } diff --git a/library/Zend/File/Transfer/Adapter/Abstract.php b/library/Zend/File/Transfer/Adapter/Abstract.php index 98ab4a1b89..7227be415d 100644 --- a/library/Zend/File/Transfer/Adapter/Abstract.php +++ b/library/Zend/File/Transfer/Adapter/Abstract.php @@ -575,7 +575,7 @@ public function setOptions($options = [], $files = null) { case 'ignoreNoFile' : case 'useByteString' : case 'detectInfos' : - $this->_files[$key]['options'][$name] = (boolean) $value; + $this->_files[$key]['options'][$name] = (bool) $value; break; default: diff --git a/library/Zend/Filter/Alnum.php b/library/Zend/Filter/Alnum.php index 5a710e0c51..fe8d51ff6f 100644 --- a/library/Zend/Filter/Alnum.php +++ b/library/Zend/Filter/Alnum.php @@ -83,7 +83,7 @@ public function __construct($allowWhiteSpace = false) } } - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; if (null === self::$_unicodeEnabled) { self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false; } @@ -115,7 +115,7 @@ public function getAllowWhiteSpace() */ public function setAllowWhiteSpace($allowWhiteSpace) { - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; return $this; } diff --git a/library/Zend/Filter/Alpha.php b/library/Zend/Filter/Alpha.php index 7eae0e6842..9b01efe1a9 100644 --- a/library/Zend/Filter/Alpha.php +++ b/library/Zend/Filter/Alpha.php @@ -83,7 +83,7 @@ public function __construct($allowWhiteSpace = false) } } - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; if (null === self::$_unicodeEnabled) { self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false; } @@ -115,7 +115,7 @@ public function getAllowWhiteSpace() */ public function setAllowWhiteSpace($allowWhiteSpace) { - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; return $this; } diff --git a/library/Zend/Filter/Boolean.php b/library/Zend/Filter/Boolean.php index 650b06e384..c30c40d495 100644 --- a/library/Zend/Filter/Boolean.php +++ b/library/Zend/Filter/Boolean.php @@ -223,7 +223,7 @@ public function getCasting() */ public function setCasting($casting = true) { - $this->_casting = (boolean) $casting; + $this->_casting = (bool) $casting; return $this; } diff --git a/library/Zend/Filter/Encrypt/Openssl.php b/library/Zend/Filter/Encrypt/Openssl.php index a438c6c489..889fb284a9 100644 --- a/library/Zend/Filter/Encrypt/Openssl.php +++ b/library/Zend/Filter/Encrypt/Openssl.php @@ -341,7 +341,7 @@ public function getPackage() */ public function setPackage($package) { - $this->_package = (boolean) $package; + $this->_package = (bool) $package; return $this; } diff --git a/library/Zend/Filter/File/Rename.php b/library/Zend/Filter/File/Rename.php index e6d1d8bff3..51b7fa8196 100644 --- a/library/Zend/Filter/File/Rename.php +++ b/library/Zend/Filter/File/Rename.php @@ -223,7 +223,7 @@ protected function _convertOptions($options) { break; case 'overwrite' : - $files['overwrite'] = (boolean) $value; + $files['overwrite'] = (bool) $value; break; default: diff --git a/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php index e59407f297..43b9a0bd67 100644 --- a/library/Zend/Filter/HtmlEntities.php +++ b/library/Zend/Filter/HtmlEntities.php @@ -182,7 +182,7 @@ public function getDoubleQuote() */ public function setDoubleQuote($doubleQuote) { - $this->_doubleQuote = (boolean) $doubleQuote; + $this->_doubleQuote = (bool) $doubleQuote; return $this; } diff --git a/library/Zend/Filter/RealPath.php b/library/Zend/Filter/RealPath.php index 8137c0ec6f..cdafb35354 100644 --- a/library/Zend/Filter/RealPath.php +++ b/library/Zend/Filter/RealPath.php @@ -73,11 +73,11 @@ public function setExists($exists) if (is_array($exists)) { if (isset($exists['exists'])) { - $exists = (boolean) $exists['exists']; + $exists = (bool) $exists['exists']; } } - $this->_exists = (boolean) $exists; + $this->_exists = (bool) $exists; return $this; } diff --git a/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php index db81b10dbc..6ac1f3b1f3 100644 --- a/library/Zend/Filter/StripTags.php +++ b/library/Zend/Filter/StripTags.php @@ -136,7 +136,7 @@ public function getCommentsAllowed() */ public function setCommentsAllowed($commentsAllowed) { - $this->commentsAllowed = (boolean) $commentsAllowed; + $this->commentsAllowed = (bool) $commentsAllowed; return $this; } diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php index 996fd872d4..0b81b18acf 100644 --- a/library/Zend/Form/Element/File.php +++ b/library/Zend/Form/Element/File.php @@ -562,12 +562,12 @@ public function getFileInfo($value = null) */ public function setMultiFile($count) { - if ((integer) $count < 2) { + if ((int) $count < 2) { $this->setIsArray(false); $this->_counter = 1; } else { $this->setIsArray(true); - $this->_counter = (integer) $count; + $this->_counter = (int) $count; } return $this; @@ -663,7 +663,7 @@ private function _convertIniToInteger($setting) } } - return (integer) $setting; + return (int) $setting; } /** diff --git a/library/Zend/Locale/Data.php b/library/Zend/Locale/Data.php index 8e532cd8d5..976a74b0c6 100644 --- a/library/Zend/Locale/Data.php +++ b/library/Zend/Locale/Data.php @@ -1576,7 +1576,7 @@ public static function clearCache() */ public static function disableCache($flag) { - self::$_cacheDisabled = (boolean) $flag; + self::$_cacheDisabled = (bool) $flag; } /** diff --git a/library/Zend/Paginator.php b/library/Zend/Paginator.php index 45541271a3..b0b9df7ff0 100644 --- a/library/Zend/Paginator.php +++ b/library/Zend/Paginator.php @@ -645,7 +645,7 @@ public function getCurrentPageNumber() */ public function setCurrentPageNumber($pageNumber) { - $this->_currentPageNumber = (integer) $pageNumber; + $this->_currentPageNumber = (int) $pageNumber; $this->_currentItems = null; $this->_currentItemCount = null; @@ -744,7 +744,7 @@ public function getItemCountPerPage() */ public function setItemCountPerPage($itemCountPerPage = -1) { - $this->_itemCountPerPage = (integer) $itemCountPerPage; + $this->_itemCountPerPage = (int) $itemCountPerPage; if ($this->_itemCountPerPage < 1) { $this->_itemCountPerPage = $this->getTotalItemCount(); } @@ -844,7 +844,7 @@ public function getPageRange() */ public function setPageRange($pageRange) { - $this->_pageRange = (integer) $pageRange; + $this->_pageRange = (int) $pageRange; return $this; } @@ -948,7 +948,7 @@ public function setView(?Zend_View_Interface $view = null) */ public function normalizeItemNumber($itemNumber) { - $itemNumber = (integer) $itemNumber; + $itemNumber = (int) $itemNumber; if ($itemNumber < 1) { $itemNumber = 1; @@ -969,7 +969,7 @@ public function normalizeItemNumber($itemNumber) */ public function normalizePageNumber($pageNumber) { - $pageNumber = (integer) $pageNumber; + $pageNumber = (int) $pageNumber; if ($pageNumber < 1) { $pageNumber = 1; diff --git a/library/Zend/Service/LiveDocx/MailMerge.php b/library/Zend/Service/LiveDocx/MailMerge.php index a10be838f1..6f10ab8f8d 100644 --- a/library/Zend/Service/LiveDocx/MailMerge.php +++ b/library/Zend/Service/LiveDocx/MailMerge.php @@ -393,12 +393,12 @@ public function getMetafiles($fromPage, $toPage) $ret = []; $result = $this->getSoapClient()->GetMetafiles([ - 'fromPage' => (integer) $fromPage, - 'toPage' => (integer) $toPage, + 'fromPage' => (int) $fromPage, + 'toPage' => (int) $toPage, ]); if (isset($result->GetMetafilesResult->string)) { - $pageCounter = (integer) $fromPage; + $pageCounter = (int) $fromPage; if (is_array($result->GetMetafilesResult->string)) { foreach ($result->GetMetafilesResult->string as $string) { $ret[$pageCounter] = base64_decode($string); @@ -459,14 +459,14 @@ public function getBitmaps($fromPage, $toPage, $zoomFactor, $format) $ret = []; $result = $this->getSoapClient()->GetBitmaps([ - 'fromPage' => (integer) $fromPage, - 'toPage' => (integer) $toPage, - 'zoomFactor' => (integer) $zoomFactor, + 'fromPage' => (int) $fromPage, + 'toPage' => (int) $toPage, + 'zoomFactor' => (int) $zoomFactor, 'format' => (string) $format, ]); if (isset($result->GetBitmapsResult->string)) { - $pageCounter = (integer) $fromPage; + $pageCounter = (int) $fromPage; if (is_array($result->GetBitmapsResult->string)) { foreach ($result->GetBitmapsResult->string as $string) { $ret[$pageCounter] = base64_decode($string); @@ -495,7 +495,7 @@ public function getAllBitmaps($zoomFactor, $format) $ret = []; $result = $this->getSoapClient()->GetAllBitmaps([ - 'zoomFactor' => (integer) $zoomFactor, + 'zoomFactor' => (int) $zoomFactor, 'format' => (string) $format, ]); @@ -692,7 +692,7 @@ public function templateExists($filename) 'filename' => basename($filename), ]); - return (boolean) $result->TemplateExistsResult; + return (bool) $result->TemplateExistsResult; } /** @@ -1054,7 +1054,7 @@ public function imageExists($filename) 'filename' => basename($filename), ]); - return (boolean) $result->ImageExistsResult; + return (bool) $result->ImageExistsResult; } /** @@ -1085,9 +1085,9 @@ protected function _backendListArrayToMultiAssocArray($list) $ret[] = [ 'filename' => $o->string[0], - 'fileSize' => (integer) $o->string[2], - 'createTime' => (integer) $date1->get(Zend_Date::TIMESTAMP), - 'modifyTime' => (integer) $date2->get(Zend_Date::TIMESTAMP), + 'fileSize' => (int) $o->string[2], + 'createTime' => (int) $date1->get(Zend_Date::TIMESTAMP), + 'modifyTime' => (int) $date2->get(Zend_Date::TIMESTAMP), ]; } } diff --git a/library/Zend/Service/Rackspace/Servers.php b/library/Zend/Service/Rackspace/Servers.php index 4aa506d936..9ee1ed0f10 100644 --- a/library/Zend/Service/Rackspace/Servers.php +++ b/library/Zend/Service/Rackspace/Servers.php @@ -159,8 +159,8 @@ public function createServer(array $data, $metadata=[],$files=[]) if (!empty($metadata)) { $data['metadata']= $metadata; } - $data['flavorId']= (integer) $data['flavorId']; - $data['imageId']= (integer) $data['imageId']; + $data['flavorId']= (int) $data['flavorId']; + $data['imageId']= (int) $data['imageId']; if (!empty($files)) { foreach ($files as $serverPath => $filePath) { if (!file_exists($filePath)) { @@ -409,7 +409,7 @@ public function shareIpAddress($id,$ip,$groupId,$configure=true) throw new Zend_Service_Rackspace_Exception('You didn\'t specified the group id to use'); } $data= [ - 'sharedIpGroupId' => (integer) $groupId, + 'sharedIpGroupId' => (int) $groupId, 'configureServer' => $configure ]; $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/ips/public/'.rawurlencode($ip),'PUT', @@ -561,7 +561,7 @@ public function rebuildServer($id,$imageId) } $data= [ 'rebuild' => [ - 'imageId' => (integer) $imageId + 'imageId' => (int) $imageId ] ]; $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', @@ -617,7 +617,7 @@ public function resizeServer($id,$flavorId) } $data= [ 'resize' => [ - 'flavorId' => (integer) $flavorId + 'flavorId' => (int) $flavorId ] ]; $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id).'/action', @@ -915,7 +915,7 @@ public function createImage($serverId,$name) } $data = [ 'image' => [ - 'serverId' => (integer) $serverId, + 'serverId' => (int) $serverId, 'name' => $name ] ]; @@ -1216,7 +1216,7 @@ public function createSharedIpGroup($name,$serverId) $data = [ 'sharedIpGroup' => [ 'name' => $name, - 'server' => (integer) $serverId + 'server' => (int) $serverId ] ]; $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups', diff --git a/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php b/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php index 30e09b753e..645d53b965 100644 --- a/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php +++ b/library/Zend/Service/Rackspace/Servers/SharedIpGroup.php @@ -146,7 +146,7 @@ public function getServer($id) */ public function createServer(array $data, $metadata=[],$files=[]) { - $data['sharedIpGroupId']= (integer) $this->id; + $data['sharedIpGroupId']= (int) $this->id; return $this->service->createServer($data,$metadata,$files); } /** diff --git a/library/Zend/Session/SaveHandler/DbTable.php b/library/Zend/Session/SaveHandler/DbTable.php index 35d3ebb998..751a01c10c 100644 --- a/library/Zend/Session/SaveHandler/DbTable.php +++ b/library/Zend/Session/SaveHandler/DbTable.php @@ -268,7 +268,7 @@ public function getLifetime() */ public function setOverrideLifetime($overrideLifetime) { - $this->_overrideLifetime = (boolean) $overrideLifetime; + $this->_overrideLifetime = (bool) $overrideLifetime; return $this; } diff --git a/library/Zend/Translate/Adapter/Tmx.php b/library/Zend/Translate/Adapter/Tmx.php index fd396c8474..78614bc56f 100644 --- a/library/Zend/Translate/Adapter/Tmx.php +++ b/library/Zend/Translate/Adapter/Tmx.php @@ -68,7 +68,7 @@ protected function _loadTranslationData($filename, $locale, array $options = []) } if (isset($options['useId'])) { - $this->_useId = (boolean) $options['useId']; + $this->_useId = (bool) $options['useId']; } $encoding = $this->_findEncoding($filename); diff --git a/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php index 001e1e9e11..7bf9c3f100 100644 --- a/library/Zend/Uri/Http.php +++ b/library/Zend/Uri/Http.php @@ -554,7 +554,7 @@ public function validatePath($path = null) throw new Zend_Uri_Exception('Internal error: path validation failed'); } - return (boolean) $status; + return (bool) $status; } /** @@ -740,7 +740,7 @@ public function validateFragment($fragment = null) throw new Zend_Uri_Exception('Internal error: fragment validation failed'); } - return (boolean) $status; + return (bool) $status; } /** diff --git a/library/Zend/Validate.php b/library/Zend/Validate.php index 5f79df0a95..0929066d98 100644 --- a/library/Zend/Validate.php +++ b/library/Zend/Validate.php @@ -75,7 +75,7 @@ public function addValidator(Zend_Validate_Interface $validator, $breakChainOnFa { $this->_validators[] = [ 'instance' => $validator, - 'breakChainOnFailure' => (boolean) $breakChainOnFailure + 'breakChainOnFailure' => (bool) $breakChainOnFailure ]; return $this; } diff --git a/library/Zend/Validate/Alnum.php b/library/Zend/Validate/Alnum.php index 52bfd3f2e0..2e6b3916a4 100644 --- a/library/Zend/Validate/Alnum.php +++ b/library/Zend/Validate/Alnum.php @@ -81,7 +81,7 @@ public function __construct($allowWhiteSpace = false) } } - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; } /** @@ -102,7 +102,7 @@ public function getAllowWhiteSpace() */ public function setAllowWhiteSpace($allowWhiteSpace) { - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; return $this; } diff --git a/library/Zend/Validate/Alpha.php b/library/Zend/Validate/Alpha.php index 3254df5c9c..5bf0d4bce9 100644 --- a/library/Zend/Validate/Alpha.php +++ b/library/Zend/Validate/Alpha.php @@ -81,7 +81,7 @@ public function __construct($allowWhiteSpace = false) } } - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; } /** @@ -102,7 +102,7 @@ public function getAllowWhiteSpace() */ public function setAllowWhiteSpace($allowWhiteSpace) { - $this->allowWhiteSpace = (boolean) $allowWhiteSpace; + $this->allowWhiteSpace = (bool) $allowWhiteSpace; return $this; } diff --git a/library/Zend/Validate/Barcode/AdapterAbstract.php b/library/Zend/Validate/Barcode/AdapterAbstract.php index 81498b3c9e..d5a9c41603 100644 --- a/library/Zend/Validate/Barcode/AdapterAbstract.php +++ b/library/Zend/Validate/Barcode/AdapterAbstract.php @@ -193,7 +193,7 @@ public function getCheck() */ public function setCheck($check) { - $this->_hasChecksum = (boolean) $check; + $this->_hasChecksum = (bool) $check; return $this; } diff --git a/library/Zend/Validate/EmailAddress.php b/library/Zend/Validate/EmailAddress.php index dd1c83857a..d4858d4790 100644 --- a/library/Zend/Validate/EmailAddress.php +++ b/library/Zend/Validate/EmailAddress.php @@ -337,7 +337,7 @@ public function getDomainCheck() */ public function setDomainCheck($domain = true) { - $this->_options['domain'] = (boolean) $domain; + $this->_options['domain'] = (bool) $domain; return $this; } diff --git a/library/Zend/Validate/File/Count.php b/library/Zend/Validate/File/Count.php index 0e52f8a801..37a6239448 100644 --- a/library/Zend/Validate/File/Count.php +++ b/library/Zend/Validate/File/Count.php @@ -156,7 +156,7 @@ public function setMin($min) throw new Zend_Validate_Exception ('Invalid options to validator provided'); } - $min = (integer) $min; + $min = (int) $min; if (($this->_max !== null) && ($min > $this->_max)) { require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum file count, but $min >" @@ -195,7 +195,7 @@ public function setMax($max) throw new Zend_Validate_Exception ('Invalid options to validator provided'); } - $max = (integer) $max; + $max = (int) $max; if (($this->_min !== null) && ($max < $this->_min)) { require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum file count, but " diff --git a/library/Zend/Validate/File/Extension.php b/library/Zend/Validate/File/Extension.php index 98860fbe92..b0b367ad56 100644 --- a/library/Zend/Validate/File/Extension.php +++ b/library/Zend/Validate/File/Extension.php @@ -110,7 +110,7 @@ public function getCase() */ public function setCase($case) { - $this->_case = (boolean) $case; + $this->_case = (bool) $case; return $this; } diff --git a/library/Zend/Validate/File/MimeType.php b/library/Zend/Validate/File/MimeType.php index 5709fad562..7348651092 100644 --- a/library/Zend/Validate/File/MimeType.php +++ b/library/Zend/Validate/File/MimeType.php @@ -214,7 +214,7 @@ public function setMagicFile($file) */ public function setTryCommonMagicFilesFlag($flag = true) { - $this->_tryCommonMagicFiles = (boolean) $flag; + $this->_tryCommonMagicFiles = (bool) $flag; return $this; } @@ -249,7 +249,7 @@ public function getHeaderCheck() */ public function enableHeaderCheck($headerCheck = true) { - $this->_headerCheck = (boolean) $headerCheck; + $this->_headerCheck = (bool) $headerCheck; return $this; } diff --git a/library/Zend/Validate/File/Size.php b/library/Zend/Validate/File/Size.php index 33634f1a96..1f54041b55 100644 --- a/library/Zend/Validate/File/Size.php +++ b/library/Zend/Validate/File/Size.php @@ -186,7 +186,7 @@ public function setMin($min) throw new Zend_Validate_Exception ('Invalid options to validator provided'); } - $min = (integer) $this->_fromByteString($min); + $min = (int) $this->_fromByteString($min); $max = $this->getMax(true); if (($max !== null) && ($min > $max)) { require_once 'Zend/Validate/Exception.php'; @@ -228,7 +228,7 @@ public function setMax($max) throw new Zend_Validate_Exception ('Invalid options to validator provided'); } - $max = (integer) $this->_fromByteString($max); + $max = (int) $this->_fromByteString($max); $min = $this->getMin(true); if (($min !== null) && ($max < $min)) { require_once 'Zend/Validate/Exception.php'; @@ -344,7 +344,7 @@ protected function _toByteString($size) protected function _fromByteString($size) { if (is_numeric($size)) { - return (integer) $size; + return (int) $size; } $type = trim(substr($size, -2, 1)); diff --git a/library/Zend/Validate/Identical.php b/library/Zend/Validate/Identical.php index b182916bb1..46d2a61884 100644 --- a/library/Zend/Validate/Identical.php +++ b/library/Zend/Validate/Identical.php @@ -124,7 +124,7 @@ public function getStrict() */ public function setStrict($strict) { - $this->_strict = (boolean) $strict; + $this->_strict = (bool) $strict; return $this; } diff --git a/library/Zend/Validate/InArray.php b/library/Zend/Validate/InArray.php index 1bc010f230..18eb3bf4db 100644 --- a/library/Zend/Validate/InArray.php +++ b/library/Zend/Validate/InArray.php @@ -143,7 +143,7 @@ public function getStrict() */ public function setStrict($strict) { - $this->_strict = (boolean) $strict; + $this->_strict = (bool) $strict; return $this; } @@ -165,7 +165,7 @@ public function getRecursive() */ public function setRecursive($recursive) { - $this->_recursive = (boolean) $recursive; + $this->_recursive = (bool) $recursive; return $this; } diff --git a/library/Zend/Validate/Ip.php b/library/Zend/Validate/Ip.php index b4768a7714..bdd69a8971 100644 --- a/library/Zend/Validate/Ip.php +++ b/library/Zend/Validate/Ip.php @@ -96,11 +96,11 @@ public function getOptions() public function setOptions($options) { if (array_key_exists('allowipv6', $options)) { - $this->_options['allowipv6'] = (boolean) $options['allowipv6']; + $this->_options['allowipv6'] = (bool) $options['allowipv6']; } if (array_key_exists('allowipv4', $options)) { - $this->_options['allowipv4'] = (boolean) $options['allowipv4']; + $this->_options['allowipv4'] = (bool) $options['allowipv4']; } if (!$this->_options['allowipv4'] && !$this->_options['allowipv6']) { diff --git a/library/Zend/Validate/StringLength.php b/library/Zend/Validate/StringLength.php index 4807762494..cf0e343276 100644 --- a/library/Zend/Validate/StringLength.php +++ b/library/Zend/Validate/StringLength.php @@ -140,7 +140,7 @@ public function setMin($min) throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum length, but $min >" . " $this->_max"); } - $this->_min = max(0, (integer) $min); + $this->_min = max(0, (int) $min); return $this; } @@ -173,7 +173,7 @@ public function setMax($max) throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum length, but " . "$max < $this->_min"); } else { - $this->_max = (integer) $max; + $this->_max = (int) $max; } return $this;