Thanks to visit codestin.com
Credit goes to github.com

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

Commit 4d868a7

Browse files
Maks3wMaks3w
committed
Merge branch 'master' of github.com:zendframework/zf2
2 parents 385ce7d + 8d37cd0 commit 4d868a7

64 files changed

Lines changed: 167 additions & 75 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/AbstractOptions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/
@@ -121,7 +121,7 @@ public function __get($key)
121121
/**
122122
* @see ParameterObject::__isset()
123123
* @param string $key
124-
* @return boolean
124+
* @return bool
125125
*/
126126
public function __isset($key)
127127
{

‎src/ArraySerializableInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/

‎src/ArrayStack.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/

‎src/ArrayUtils.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/

‎src/CallbackHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/
@@ -39,13 +39,13 @@ class CallbackHandler
3939

4040
/**
4141
* PHP version is greater as 5.4rc1?
42-
* @var boolean
42+
* @var bool
4343
*/
4444
protected static $isPhp54;
4545

4646
/**
4747
* Is pecl/weakref extension installed?
48-
* @var boolean
48+
* @var bool
4949
*/
5050
protected static $hasWeakRefExtension;
5151

‎src/DateTime.php‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
/**
3+
* Zend Framework (http://framework.zend.com/)
4+
*
5+
* @link http://github.com/zendframework/zf2 for the canonical source repository
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
7+
* @license http://framework.zend.com/license/new-bsd New BSD License
8+
* @package Zend_Stdlib
9+
*/
10+
11+
namespace Zend\Stdlib;
12+
13+
use DateTimeZone;
14+
15+
/**
16+
* DateTime
17+
*
18+
* An extension of the \DateTime object.
19+
*
20+
* @category Zend
21+
* @package Zend_Stdlib
22+
*/
23+
class DateTime extends \DateTime
24+
{
25+
/**
26+
* The DateTime::ISO8601 constant used by php's native DateTime object does
27+
* not allow for fractions of a second. This function better handles ISO8601
28+
* formatted date strings.
29+
*
30+
* @param string $time
31+
* @param DateTimeZone $timezone
32+
* @return mixed
33+
*/
34+
public static function createFromISO8601($time, DateTimeZone $timezone = null)
35+
{
36+
$format = self::ISO8601;
37+
if (isset($time[19]) && $time[19] === '.') {
38+
$format = 'Y-m-d\TH:i:s.uO';
39+
}
40+
41+
if ($timezone !== null) {
42+
return self::createFromFormat($format, $time, $timezone);
43+
}
44+
45+
return self::createFromFormat($format, $time);
46+
}
47+
48+
}

‎src/DispatchableInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/

‎src/ErrorHandler.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/
@@ -24,7 +24,7 @@ abstract class ErrorHandler
2424
/**
2525
* Flag to mark started
2626
*
27-
* @var boolean
27+
* @var bool
2828
*/
2929
protected static $started = false;
3030

@@ -39,7 +39,7 @@ abstract class ErrorHandler
3939
/**
4040
* If the error handler has been started.
4141
*
42-
* @return boolean
42+
* @return bool
4343
*/
4444
public static function started()
4545
{
@@ -67,7 +67,7 @@ public static function start($errorLevel = \E_WARNING)
6767
/**
6868
* Stopping the error handler
6969
*
70-
* @param boolean $throw Throw the ErrorException if any
70+
* @param bool $throw Throw the ErrorException if any
7171
* @return null|ErrorException
7272
* @throws Exception\LogicException If not started before
7373
* @throws ErrorException If an error has been catched and $throw is true

‎src/Exception/BadMethodCallException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/

‎src/Exception/DomainException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Zend Framework (http://framework.zend.com/)
44
*
55
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
6+
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
77
* @license http://framework.zend.com/license/new-bsd New BSD License
88
* @package Zend_Stdlib
99
*/

0 commit comments

Comments
 (0)