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

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
@wdalmut
wdalmut committed Jul 26, 2012
67 parents 40148aa + fcdb53c + 4695159 + 8c4a1a4 + 1ac8bc9 + 266a726 + a48d0b4 + 8bbe006 + f7a58c4 + ef00607 + 03f1a39 + fa9020e + 290a868 + 12376e4 + f183282 + 5609ded + b742a14 + 6ee62cd + 2d5f08c + 5f0a20d + da6d437 + 6020243 + 6cf319f + 7764705 + 8858064 + d35a73e + 4dca7a7 + e331113 + b288c81 + a7e1ad0 + c0434da + bc3b794 + 137fd45 + d2ea768 + 614b493 + f2158f1 + 6ad7c37 + 4f10632 + 1be14cc + 46a76e6 + bb3de95 + f1962e2 + 8c5e72d + 580978e + fcbde5a + 0bc3146 + e29de4d + 3fda4ad + 69ba799 + 3227b7b + 5f6a326 + 0f56ab5 + 5b30430 + a696f90 + a8bc04a + 9e53124 + aa8a772 + 1dacd62 + b1d673b + 4ca3a91 + 3823a47 + 08b23c4 + 6438497 + 1d7c8db + 9d80a9e + 10c5fc3 + 875f572 commit d32773b
Show file tree
Hide file tree
Showing 19 changed files with 129 additions and 334 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
View file

This file was deleted.

20 changes: 10 additions & 10 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "zendframework/zend-progress-bar",
"description": "Zend\\ProgressBar component",
"name": "zendframework/zend-progressbar",
"description": "component to create and update progressbars in different environments",
"license": "BSD-3-Clause",
"keywords": [
"zf2",
"progress-bar"
"progressbar"
],
"autoload": {
"psr-4": {
"Zend\\ProgressBar\\": "src/"
"Zend\\ProgressBar": "src/"
}
},
"require": {
"php": ">=5.3.23"
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
"satooshi/php-coveralls": "dev-master",
"phpunit/PHPUnit": "~4.0"
"php": ">=5.3.3"
},
"homepage": "https://github.com/zendframework/zend-progress-bar",
"autoload-dev": {
"psr-4": {
"ZendTest\\ProgressBar\\": "test/"
}
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
"satooshi/php-coveralls": "dev-master",
"phpunit/PHPUnit": "~4.0"
}
}
20 changes: 4 additions & 16 deletions src/Adapter/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
<?php
/**
* Zend Framework
* Zend Framework (http://framework.zend.com/)
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -28,8 +18,6 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class AbstractAdapter
{
Expand Down
22 changes: 6 additions & 16 deletions src/Adapter/Console.php
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
<?php
/**
* LICENSE
* Zend Framework (http://framework.zend.com/)
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -26,8 +18,6 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Console extends AbstractAdapter
{
Expand Down Expand Up @@ -232,7 +222,7 @@ public function setWidth($width = null)
// Try to determine the width through stty
if (preg_match('#\d+ (\d+)#', @shell_exec('stty size'), $match) === 1) {
$this->_width = (int) $match[1];
} else if (preg_match('#columns = (\d+);#', @shell_exec('stty'), $match) === 1) {
} elseif (preg_match('#columns = (\d+);#', @shell_exec('stty'), $match) === 1) {
$this->_width = (int) $match[1];
}
}
Expand Down
23 changes: 5 additions & 18 deletions src/Adapter/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
<?php
/**
* Zend Framework
* Zend Framework (http://framework.zend.com/)
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ProgressBar\Adapter\Exception;
Expand All @@ -27,10 +17,7 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface ExceptionInterface
extends ProgressBarException
interface ExceptionInterface extends ProgressBarException
{
}
25 changes: 6 additions & 19 deletions src/Adapter/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<?php
/**
* Zend Framework
* Zend Framework (http://framework.zend.com/)
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter\Exception;
Expand All @@ -28,9 +17,7 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
{}
25 changes: 6 additions & 19 deletions src/Adapter/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<?php
/**
* Zend Framework
* Zend Framework (http://framework.zend.com/)
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter\Exception;
Expand All @@ -28,9 +17,7 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RuntimeException extends Exception\RuntimeException implements
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
{}
20 changes: 5 additions & 15 deletions src/Adapter/JsPull.php
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
<?php
/**
* LICENSE
* Zend Framework (http://framework.zend.com/)
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -26,8 +18,6 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class JsPull extends AbstractAdapter
{
Expand Down
20 changes: 5 additions & 15 deletions src/Adapter/JsPush.php
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
<?php
/**
* LICENSE
* Zend Framework (http://framework.zend.com/)
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -26,8 +18,6 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class JsPush extends AbstractAdapter
{
Expand Down
20 changes: 4 additions & 16 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
<?php
/**
* Zend Framework
* Zend Framework (http://framework.zend.com/)
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ProgressBar\Exception;
Expand All @@ -25,8 +15,6 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface ExceptionInterface
{
Expand Down
30 changes: 8 additions & 22 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<?php
/**
* Zend Framework
* Zend Framework (http://framework.zend.com/)
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;
Expand All @@ -26,10 +15,7 @@
*
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException
extends \InvalidArgumentException
implements ExceptionInterface
{}
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{}
Loading

0 comments on commit d32773b

Please sign in to comment.