Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotifx/4355' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#4355
  • Loading branch information
@weierophinney
weierophinney committed Apr 29, 2013
138 parents b0c018c + 5686261 + 032f44f + ab83210 + 88be4ef + e672b58 + c5c6433 + a6b0c4e + 28d72f0 + 48c143c + acee230 + 9a49788 + efd47ef + 8dad02c + 9be7abf + bf9e60b + a03898c + 025fb19 + 6551ff4 + e5066db + 30065eb + cd23bdb + f518ed9 + 54153cf + e4984e8 + cc9c920 + b3042ce + e57fd9d + d07707d + 60d87e0 + dea915e + 4f2f391 + e61f957 + a301eb4 + 86ee99c + 4f18442 + 0560233 + 803be33 + b3b44b2 + 747588e + ff0efd2 + 5651d65 + a3fbf6b + 2a0a9d7 + e987caa + f6cf6f8 + a97175a + 18ecd64 + f00b78e + 18be569 + af6e96a + a62b890 + 369a5ce + 2f4d803 + 045137d + 2fdcee4 + 147c99e + d95685a + 9fceeb6 + 4682ed8 + 58e6c7d + f9a818b + b470c79 + ce259b2 + 47e8c8b + 62bd37a + f6216bb + 01cd418 + 1d5008a + f7d1866 + 339c91f + 105863b + d697919 + a07d04f + ab69e95 + a01fec1 + 79aa858 + e6c1f7b + caa3725 + 42e5478 + 2d5d2cd + 80ddcc5 + e2d6bae + 4d230a7 + eb81fcd + d11d08b + 260e6bd + 7ad155b + 5fc070f + c78a364 + 4941bab + c4245dd + b4f05cd + a274d7e + 9ddc5d3 + b327453 + 4fb6bdc + 589d10e + 1190c26 + 7a8c4e6 + 34dd90e + 181ab3e + 67215df + 3722470 + 760ae55 + 71ba5e4 + 0e69738 + 5fee79a + edb69b7 + affa8ee + b842366 + 8bcb41c + 2d61aeb + 3e577bd + c050df1 + 2912cc2 + 480b09d + 9ef4bbd + a9fbb32 + a3442c5 + 3ba9ec5 + 249bcf9 + 17f4e58 + f5df8ff + 09c6fb7 + 244cca2 + e70f1f7 + c0ba5d9 + af32048 + e486343 + 2925378 + 7987d36 + f33a6b9 + ccec312 + c6e5159 + c5316e9 + c0d0bfc + 5432a9b commit 644a1db
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions src/Object/AbstractObject.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public function getType()
* Set height of the barcode bar
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBarHeight($value)
{
Expand All @@ -300,7 +300,7 @@ public function getBarHeight()
* Set thickness of thin bar
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBarThinWidth($value)
{
Expand All @@ -326,7 +326,7 @@ public function getBarThinWidth()
* Set thickness of thick bar
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBarThickWidth($value)
{
Expand All @@ -353,7 +353,7 @@ public function getBarThickWidth()
* thinBarWidth - thickBarWidth - barHeight - fontSize
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setFactor($value)
{
Expand All @@ -380,7 +380,7 @@ public function getFactor()
* Set color of the barcode and text
* @param string $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setForeColor($value)
{
Expand Down Expand Up @@ -409,7 +409,7 @@ public function getForeColor()
* Set the color of the background
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setBackgroundColor($value)
{
Expand Down Expand Up @@ -490,7 +490,7 @@ public function setReverseColor()
* Set orientation of barcode and text
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setOrientation($value)
{
Expand Down Expand Up @@ -602,7 +602,7 @@ public function getDrawText()
* of the characters to the position of the bars
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setStretchText($value)
{
Expand Down Expand Up @@ -651,7 +651,7 @@ public function getWithChecksum()
* added to the barcode text
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setWithChecksumInText($value)
{
Expand All @@ -677,7 +677,7 @@ public function getWithChecksumInText()
* - if string, $value is assumed to be the path to a TTF font
* @param int|string $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setFont($value)
{
Expand Down Expand Up @@ -717,7 +717,7 @@ public function getFont()
* Set the size of the font in case of TTF
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
public function setFontSize($value)
{
Expand Down Expand Up @@ -845,7 +845,7 @@ public function checkParams()
/**
* Check if a text is really provided to barcode
* @return void
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkText($value = null)
{
Expand All @@ -865,7 +865,7 @@ protected function checkText($value = null)
* @param int $min
* @param int $max
* @return void
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkRatio($min = 2, $max = 3)
{
Expand All @@ -883,7 +883,7 @@ protected function checkRatio($min = 2, $max = 3)
/**
* Drawing with an angle is just allow TTF font
* @return void
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkFontAndOrientation()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Object/Identcode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function getTextToDisplay()
* Check allowed characters
* @param string $value
* @return string
* @throw Exception
* @throws Exception
*/
public function validateText($value)
{
Expand Down

0 comments on commit 644a1db

Please sign in to comment.