Skip to content

Commit

Permalink
[hotfix/ZF-11122] Documentation
Browse files Browse the repository at this point in the history
- fixed year within copyright headers
  • Loading branch information
thomasweidner committed Jul 26, 2011
1 parent e76d957 commit 7fb12dd
Show file tree
Hide file tree
Showing 17 changed files with 635 additions and 635 deletions.
2 changes: 1 addition & 1 deletion demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @category Zend
* @package Zend_Gdata
* @subpackage Demos
* @copyright Copyright (c) 2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Config/Json.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -27,7 +27,7 @@
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Json extends Config
Expand Down Expand Up @@ -229,8 +229,8 @@ protected function _getConstants()

/**
* Flatten JSON object structure to associative array
*
* @param object|array $config
*
* @param object|array $config
* @return array
*/
protected function flattenObjects($config)
Expand Down
4 changes: 2 additions & 2 deletions library/Zend/Config/Writer/Json.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -26,7 +26,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Json extends AbstractFileWriter
Expand Down
4 changes: 2 additions & 2 deletions library/Zend/Config/Writer/Yaml.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
Expand All @@ -27,7 +27,7 @@
/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Yaml extends AbstractFileWriter
Expand Down
32 changes: 16 additions & 16 deletions library/Zend/GData/Spreadsheets.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
*
* @link http://code.google.com/apis/gdata/spreadsheets.html
*
* @uses \Zend\GData\GData
* @uses \Zend\GData\Spreadsheets\CellEntry
* @uses \Zend\GData\Spreadsheets\CellFeed
* @uses \Zend\GData\Spreadsheets\CellQuery
* @uses \Zend\GData\Spreadsheets\DocumentQuery
* @uses \Zend\GData\Spreadsheets\ListEntry
* @uses \Zend\GData\Spreadsheets\ListFeed
* @uses \Zend\GData\Spreadsheets\ListQuery
* @uses \Zend\GData\Spreadsheets\SpreadsheetEntry
* @uses \Zend\GData\Spreadsheets\SpreadsheetFeed
* @uses \Zend\GData\Spreadsheets\WorksheetEntry
* @category Zend
* @package Zend_Gdata
* @subpackage Spreadsheets
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @uses \Zend\GData\GData
* @uses \Zend\GData\Spreadsheets\CellEntry
* @uses \Zend\GData\Spreadsheets\CellFeed
* @uses \Zend\GData\Spreadsheets\CellQuery
* @uses \Zend\GData\Spreadsheets\DocumentQuery
* @uses \Zend\GData\Spreadsheets\ListEntry
* @uses \Zend\GData\Spreadsheets\ListFeed
* @uses \Zend\GData\Spreadsheets\ListQuery
* @uses \Zend\GData\Spreadsheets\SpreadsheetEntry
* @uses \Zend\GData\Spreadsheets\SpreadsheetFeed
* @uses \Zend\GData\Spreadsheets\WorksheetEntry
* @category Zend
* @package Zend_Gdata
* @subpackage Spreadsheets
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Spreadsheets extends GData
{
Expand Down
10 changes: 5 additions & 5 deletions library/Zend/Uri/Exception/InvalidUriException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
Expand All @@ -31,12 +31,12 @@
* @uses \Zend\URI\Exception
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidUriException
extends \InvalidArgumentException
class InvalidUriException
extends \InvalidArgumentException
implements \Zend\Uri\Exception
{

}
10 changes: 5 additions & 5 deletions library/Zend/Uri/Exception/InvalidUriTypeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
Expand All @@ -31,12 +31,12 @@
* @uses \Zend\URI\Exception
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidUriTypeException
extends \InvalidArgumentException
class InvalidUriTypeException
extends \InvalidArgumentException
implements \Zend\Uri\Exception
{

}
30 changes: 15 additions & 15 deletions library/Zend/Uri/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -27,10 +27,10 @@
* File URI handler
*
* The 'file:...' scheme is loosly defined in RFC-1738
*
*
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class File extends Uri
Expand All @@ -39,10 +39,10 @@ class File extends Uri

/**
* Check if the URI is a valid File URI
*
* This applies additional specific validation rules beyond the ones
*
* This applies additional specific validation rules beyond the ones
* required by the generic URI syntax.
*
*
* @return boolean
* @see Uri::isValid()
*/
Expand All @@ -54,32 +54,32 @@ public function isValid()

return parent::isValid();
}

/**
* User Info part is not used in file URIs
*
*
* @see Uri::setUserInfo()
* @throws Exception\InvalidUriPartException
*/
public function setUserInfo($userInfo)
{
return $this;
}

/**
* Fragment part is not used in file URIs
*
*
* @see Uri::setFragment()
* @throws Exception\InvalidUriPartException
*/
public function setFragment($fragment)
{
return $this;
}

/**
* Convert a UNIX file path to a valid file:// URL
*
*
* @param string $path
* @return File
*/
Expand All @@ -93,10 +93,10 @@ public static function fromUnixPath($path)
$url->setPath($path);
return $url;
}

/**
* Convert a Windows file path to a valid file:// URL
*
*
* @param string $path
* @return File
*/
Expand All @@ -106,7 +106,7 @@ public static function fromWindowsPath($path)

// Convert directory separators
$path = str_replace(array('/', '\\'), array('%2F', '/'), $path);

// Is this an absolute path?
if (preg_match('|^([a-zA-Z]:)?/|', $path)) {
$url->setHost('');
Expand Down
38 changes: 19 additions & 19 deletions library/Zend/Uri/Http.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -28,7 +28,7 @@
*
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Http extends Uri
Expand All @@ -37,15 +37,15 @@ class Http extends Uri
* @see Uri::$validSchemes
*/
protected static $validSchemes = array('http', 'https');

/**
* @see Uri::$defaultPorts
*/
protected static $defaultPorts = array(
'http' => 80,
'https' => 443,
);

/**
* @see Uri::$validHostTypes
*/
Expand All @@ -62,13 +62,13 @@ class Http extends Uri
* @var null|string
*/
protected $password;

/**
* Check if the URI is a valid HTTP URI
*
* This applys additional HTTP specific validation rules beyond the ones
*
* This applys additional HTTP specific validation rules beyond the ones
* required by the generic URI syntax
*
*
* @return boolean
* @see Uri::isValid()
*/
Expand All @@ -79,7 +79,7 @@ public function isValid()

/**
* Get the username part (before the ':') of the userInfo URI part
*
*
* @return null|string
*/
public function getUser()
Expand All @@ -91,10 +91,10 @@ public function getUser()
$this->parseUserInfo();
return $this->user;
}

/**
* Get the password part (after the ':') of the userInfo URI part
*
*
* @return string
*/
public function getPassword()
Expand All @@ -109,7 +109,7 @@ public function getPassword()

/**
* Set the username part (before the ':') of the userInfo URI part
*
*
* @param string $user
* @return Http
*/
Expand All @@ -118,10 +118,10 @@ public function setUser($user)
$this->user = $user;
return $this;
}

/**
* Set the password part (after the ':') of the userInfo URI part
*
*
* @param string $password
* @return Http
*/
Expand All @@ -130,13 +130,13 @@ public function setPassword($password)
$this->password = $password;
return $this;
}

/**
* Validate the host part of an HTTP URI
*
*
* This overrides the common URI validation method with a DNS or IPv4 only
* default. Users may still enforce allowing other host types.
*
*
* @param string $host
* @param integer $allowed
* @return boolean
Expand All @@ -149,9 +149,9 @@ public static function validateHost($host, $allowed = self::HOST_DNSORIPV4)
/**
* Parse the user info into username and password segments
*
* Parses the user information into username and password segments, and
* Parses the user information into username and password segments, and
* then sets the appropriate values.
*
*
* @return void
*/
protected function parseUserInfo()
Expand Down
Loading

0 comments on commit 7fb12dd

Please sign in to comment.