Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resolve conflicts
  • Loading branch information
bakura10 committed Oct 23, 2012
2 parents 0e70e04 + 5b1496d commit 50319d4
Show file tree
Hide file tree
Showing 150 changed files with 7,747 additions and 466 deletions.
204 changes: 5 additions & 199 deletions CHANGELOG.md
@@ -1,205 +1,11 @@
# CHANGELOG

## 2.0.3:

- 2244: Fix for issue ZF2-503 (https://github.com/zendframework/zf2/issues/2244)
- 2318: Allow to remove decimals in CurrencyFormat
(https://github.com/zendframework/zf2/issues/2318)
- 2363: Hotfix db features with eventfeature
(https://github.com/zendframework/zf2/issues/2363)
- 2380: ZF2-482 Attempt to fix the buffer. Also added extra unit tests.
(https://github.com/zendframework/zf2/issues/2380)
- 2392: Update library/Zend/Db/Adapter/Platform/Mysql.php
(https://github.com/zendframework/zf2/issues/2392)
- 2395: Fix for http://framework.zend.com/issues/browse/ZF2-571
(https://github.com/zendframework/zf2/issues/2395)
- 2397: Memcached option merge issuse
(https://github.com/zendframework/zf2/issues/2397)
- 2402: Adding missing dependencies
(https://github.com/zendframework/zf2/issues/2402)
- 2404: Fix to comments (https://github.com/zendframework/zf2/issues/2404)
- 2416: Fix expressionParamIndex for AbstractSql
(https://github.com/zendframework/zf2/issues/2416)
- 2420: Zend\Db\Sql\Select: Fixed issue with join expression named parameters
overlapping. (https://github.com/zendframework/zf2/issues/2420)
- 2421: Update library/Zend/Http/Header/SetCookie.php
(https://github.com/zendframework/zf2/issues/2421)
- 2422: fix add 2 space after @param in Zend\Loader
(https://github.com/zendframework/zf2/issues/2422)
- 2423: ManagerInterface must be interface, remove 'interface' description
(https://github.com/zendframework/zf2/issues/2423)
- 2425: Use built-in Travis composer
(https://github.com/zendframework/zf2/issues/2425)
- 2426: Remove need of setter in ClassMethods hydrator
(https://github.com/zendframework/zf2/issues/2426)
- 2432: Prevent space before end of tag with HTML5 doctype
(https://github.com/zendframework/zf2/issues/2432)
- 2433: fix for setJsonpCallback not called when recieved JsonModel + test
(https://github.com/zendframework/zf2/issues/2433)
- 2434: added phpdoc in Zend\Db
(https://github.com/zendframework/zf2/issues/2434)
- 2437: Hotfix/console 404 reporting
(https://github.com/zendframework/zf2/issues/2437)
- 2438: Improved previous fix for ZF2-558.
(https://github.com/zendframework/zf2/issues/2438)
- 2440: Turkish Translations for Captcha and Validate
(https://github.com/zendframework/zf2/issues/2440)
- 2441: Allow form collection to have any helper
(https://github.com/zendframework/zf2/issues/2441)
- 2516: limit(20) -> generates LIMIT '20' and throws an IllegalQueryException
(https://github.com/zendframework/zf2/issues/2516)
- 2545: getSqlStringForSqlObject() returns an invalid SQL statement with LIMIT
and OFFSET clauses (https://github.com/zendframework/zf2/issues/2545)
- 2595: Pgsql adapater has codes related to MySQL
(https://github.com/zendframework/zf2/issues/2595)
- 2613: Prevent password to be rendered if form validation fails
(https://github.com/zendframework/zf2/issues/2613)
- 2617: Fixed Zend\Validator\Iban class name
(https://github.com/zendframework/zf2/issues/2617)
- 2619: Form enctype fix when File elements are within a collection
(https://github.com/zendframework/zf2/issues/2619)
- 2620: InputFilter/Input when merging was not using raw value
(https://github.com/zendframework/zf2/issues/2620)
- 2622: Added ability to specify port
(https://github.com/zendframework/zf2/issues/2622)
- 2624: Form's default input filters added multiple times
(https://github.com/zendframework/zf2/issues/2624)
- 2630: fix relative link ( remove the relative links ) in README.md
(https://github.com/zendframework/zf2/issues/2630)
- 2631: Update library/Zend/Loader/AutoloaderFactory.php
(https://github.com/zendframework/zf2/issues/2631)
- 2633: fix redundance errors "The input does not appear to be a valid date"
show twice (https://github.com/zendframework/zf2/issues/2633)
- 2635: Fix potential issue with Sitemap test
(https://github.com/zendframework/zf2/issues/2635)
- 2636: add isset checks around timeout and maxredirects
(https://github.com/zendframework/zf2/issues/2636)
- 2641: hotfix : formRow() element error multi-checkbox and radio renderError
not shown (https://github.com/zendframework/zf2/issues/2641)
- 2642: Fix Travis build for CS issue
(https://github.com/zendframework/zf2/issues/2642)
- 2643: fix for setJsonpCallback not called when recieved JsonModel + test
(https://github.com/zendframework/zf2/issues/2643)
- 2644: Add fluidity to the prepare() function for a form
(https://github.com/zendframework/zf2/issues/2644)
- 2652: Zucchi/filter tweaks (https://github.com/zendframework/zf2/issues/2652)
- 2665: pdftest fix (https://github.com/zendframework/zf2/issues/2665)
- 2666: fixed url change (https://github.com/zendframework/zf2/issues/2666)
- 2667: Possible fix for rartests
(https://github.com/zendframework/zf2/issues/2667)
- 2669: skip whem gmp is loaded
(https://github.com/zendframework/zf2/issues/2669)
- 2673: Input fallback value option
(https://github.com/zendframework/zf2/issues/2673)
- 2676: mysqli::close() never called
(https://github.com/zendframework/zf2/issues/2676)
- 2677: added phpdoc to Zend\Stdlib
(https://github.com/zendframework/zf2/issues/2677)
- 2678: Zend\Db\Adapter\Sqlsrv\Sqlsrv never calls Statement\initialize() (fix
within) (https://github.com/zendframework/zf2/issues/2678)
- 2679: Zend/Log/Logger.php using incorrect php errorLevel
(https://github.com/zendframework/zf2/issues/2679)
- 2680: Cache: fixed bug on getTotalSpace of filesystem and dba adapter
(https://github.com/zendframework/zf2/issues/2680)
- 2681: Cache/Dba: fixed notices on tearDown db4 tests
(https://github.com/zendframework/zf2/issues/2681)
- 2682: Replace 'Configuration' with 'Config' when retrieving configuration
(https://github.com/zendframework/zf2/issues/2682)
- 2683: Hotfix: Allow items from Abstract Factories to have setShared() called
(https://github.com/zendframework/zf2/issues/2683)
- 2685: Remove unused Uses (https://github.com/zendframework/zf2/issues/2685)
- 2686: Adding code to allow EventManager trigger listeners using wildcard
identifier (https://github.com/zendframework/zf2/issues/2686)
- 2687: Hotfix/db sql nested expressions
(https://github.com/zendframework/zf2/issues/2687)
- 2688: Hotfix/tablegateway event feature
(https://github.com/zendframework/zf2/issues/2688)
- 2689: Hotfix/composer phpunit
(https://github.com/zendframework/zf2/issues/2689)
- 2690: Use RFC-3339 full-date format (Y-m-d) in Date element
(https://github.com/zendframework/zf2/issues/2690)
- 2691: join on conditions don't accept alternatives to columns
(https://github.com/zendframework/zf2/issues/2691)
- 2693: Update library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
(https://github.com/zendframework/zf2/issues/2693)
- 2694: Bring fluid interface to Feed Writer
(https://github.com/zendframework/zf2/issues/2694)
- 2698: fix typo in # should be :: in exception
(https://github.com/zendframework/zf2/issues/2698)
- 2699: fix elseif in javascript Upload Demo
(https://github.com/zendframework/zf2/issues/2699)
- 2700: fix cs in casting variable
(https://github.com/zendframework/zf2/issues/2700)
- 2705: Fix french translation
(https://github.com/zendframework/zf2/issues/2705)
- 2707: Improved error message when ServiceManager does not find an invokable
class (https://github.com/zendframework/zf2/issues/2707)
- 2710: #2461 - correcting the url encoding of path segments
(https://github.com/zendframework/zf2/issues/2710)
- 2711: Fix/demos ProgressBar/ZendForm.php : Object of class Zend\Form\Form
could not be converted to string
(https://github.com/zendframework/zf2/issues/2711)
- 2712: fix cs casting variable for (array)
(https://github.com/zendframework/zf2/issues/2712)
- 2713: Update library/Zend/Mvc/Service/ViewHelperManagerFactory.php
(https://github.com/zendframework/zf2/issues/2713)
- 2714: Don't add separator if not prefixing columns
(https://github.com/zendframework/zf2/issues/2714)
- 2717: Extends when it can : Validator\DateStep extends Validator\Date to
reduce code redundancy (https://github.com/zendframework/zf2/issues/2717)
- 2719: Fixing the Cache Storage Factory Adapter Factory
(https://github.com/zendframework/zf2/issues/2719)
- 2728: Bad Regex for Content Type header
(https://github.com/zendframework/zf2/issues/2728)
- 2731: Reset the Order part when resetting Select
(https://github.com/zendframework/zf2/issues/2731)
- 2732: Removed references to Mysqli in Zend\Db\Adapter\Driver\Pgsql
(https://github.com/zendframework/zf2/issues/2732)
- 2733: fix @package Zend_Validate should be Zend_Validator
(https://github.com/zendframework/zf2/issues/2733)
- 2734: fix i18n @package and @subpackage value
(https://github.com/zendframework/zf2/issues/2734)
- 2736: fix captcha helper test.
(https://github.com/zendframework/zf2/issues/2736)
- 2737: Issue #2728 - Bad Regex for Content Type header
(https://github.com/zendframework/zf2/issues/2737)
- 2738: fix link 'quickstart' to version 2.0
(https://github.com/zendframework/zf2/issues/2738)
- 2739: remove '@subpackage' because Zend\Math is not in subpackage
(https://github.com/zendframework/zf2/issues/2739)
- 2742: remove () in echo-ing (https://github.com/zendframework/zf2/issues/2742)
- 2749: Fix for #2678 (Zend\Db's Sqlsrv Driver)
(https://github.com/zendframework/zf2/issues/2749)
- 2750: Adds the ability to instanciate by factory to AbstractPluginManager
(https://github.com/zendframework/zf2/issues/2750)
- 2754: add the support to register module paths over namespace
(https://github.com/zendframework/zf2/issues/2754)
- 2755: remove Zend\Mvc\Controller\PluginBroker from aliases in
"$defaultServiceConfig" (https://github.com/zendframework/zf2/issues/2755)
- 2759: Fix Zend\Code\Scanner\TokenArrayScanner
(https://github.com/zendframework/zf2/issues/2759)
- 2764: Fixed Zend\Math\Rand::getString() to pass the parameter $strong to
::getBytes() (https://github.com/zendframework/zf2/issues/2764)
- 2765: Csrf: always use dedicated setter
(https://github.com/zendframework/zf2/issues/2765)
- 2766: Session\Storage: always preserve REQUEST_ACCESS_TIME
(https://github.com/zendframework/zf2/issues/2766)
- 2768: Zend\Validator dependency is missed in Zend\Cache composer.json
(https://github.com/zendframework/zf2/issues/2768)
- 2769: change valueToLDAP to valueToLdap and valueFromLDAP to valueFromLdap
(https://github.com/zendframework/zf2/issues/2769)
- 2770: Memcached (https://github.com/zendframework/zf2/issues/2770)
- 2775: Zend\Db\Sql: Fix for Mysql quoting during limit and offset
(https://github.com/zendframework/zf2/issues/2775)
- 2776: Allow whitespace in Iban
(https://github.com/zendframework/zf2/issues/2776)
- 2777: Fix issue when PREG_BAD_UTF8_OFFSET_ERROR is defined but Unicode support
is not enabled on PCRE (https://github.com/zendframework/zf2/issues/2777)
- 2778: Undefined Index fix in ViewHelperManagerFactory
(https://github.com/zendframework/zf2/issues/2778)
- 2779: Allow forms that have been added as fieldsets to bind values to bound
ob... (https://github.com/zendframework/zf2/issues/2779)
- 2782: Issue 2781 (https://github.com/zendframework/zf2/issues/2782)
## 2.1.0:

- The initializer for ServiceManagerAwareInterface was removed to prevent
confusion between ServiceManagerAwareInterface and
ServiceLocatorAwareInterface, and to promote using the latter interface.


## 2.0.2:
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Barcode/Barcode.php
Expand Up @@ -20,7 +20,7 @@
* @category Zend
* @package Zend_Barcode
*/
class Barcode
abstract class Barcode
{
const OBJECT = 'OBJECT';
const RENDERER = 'RENDERER';
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Cache/PatternFactory.php
Expand Up @@ -17,7 +17,7 @@
* @category Zend
* @package Zend_Cache
*/
class PatternFactory
abstract class PatternFactory
{
/**
* The pattern manager
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Cache/StorageFactory.php
Expand Up @@ -18,7 +18,7 @@
* @package Zend_Cache
* @subpackage Storage
*/
class StorageFactory
abstract class StorageFactory
{
/**
* Plugin manager for loading adapters
Expand Down
36 changes: 36 additions & 0 deletions library/Zend/Code/Generator/ClassGenerator.php
Expand Up @@ -67,6 +67,11 @@ class ClassGenerator extends AbstractGenerator
*/
protected $methods = array();

/**
* @var array Array of string names
*/
protected $uses = array();

/**
* fromReflection() - build a Code Generation Php Object from a Class Reflection
*
Expand Down Expand Up @@ -479,6 +484,19 @@ public function addPropertyFromGenerator(PropertyGenerator $property)
return $this;
}

/**
* Add a class to "use" classes
*
* @param string $useClass
*/
public function addUse($use, $useAlias = null)
{
if (!empty($useAlias)) {
$use .= ' as ' . $useAlias;
}
$this->uses[] = $use;
}

/**
* getProperties()
*
Expand All @@ -505,6 +523,16 @@ public function getProperty($propertyName)
return false;
}

/**
* Returns the "use" classes
*
* @return array
*/
public function getUses()
{
return $this->uses;
}

/**
* hasProperty()
*
Expand Down Expand Up @@ -664,6 +692,14 @@ public function generate()
$output .= 'namespace ' . $namespace . ';' . self::LINE_FEED . self::LINE_FEED;
}

$uses = $this->getUses();
if (!empty($uses)) {
foreach ($uses as $use) {
$output .= 'use ' . $use . ';' . self::LINE_FEED;
}
$output .= self::LINE_FEED;
}

if (null !== ($docBlock = $this->getDocBlock())) {
$docBlock->setIndentation('');
$output .= $docBlock->generate();
Expand Down
58 changes: 56 additions & 2 deletions library/Zend/Code/Scanner/ClassScanner.php
Expand Up @@ -10,6 +10,7 @@

namespace Zend\Code\Scanner;

use Zend\Code\Annotation;
use Zend\Code\Exception;
use Zend\Code\NameInformation;

Expand Down Expand Up @@ -106,9 +107,17 @@ public function __construct(array $classTokens, NameInformation $nameInformation
$this->nameInformation = $nameInformation;
}

public function getAnnotations()
/**
* @param Annotation\AnnotationManager $annotationManager
* @return Annotation\AnnotationCollection
*/
public function getAnnotations(Annotation\AnnotationManager $annotationManager)
{
return array();
if (($docComment = $this->getDocComment()) == '') {
return false;
}

return new AnnotationScanner($annotationManager, $docComment, $this->nameInformation);
}

public function getDocComment()
Expand Down Expand Up @@ -206,6 +215,11 @@ public function getConstants()
return $return;
}

/**
* Returns a list of property names
*
* @return array
*/
public function getPropertyNames()
{
$this->scan();
Expand All @@ -222,6 +236,11 @@ public function getPropertyNames()
return $return;
}

/**
* Returns a list of properties
*
* @return array
*/
public function getProperties()
{
$this->scan();
Expand All @@ -238,6 +257,41 @@ public function getProperties()
return $return;
}

public function getProperty($propertyNameOrInfoIndex)
{
$this->scan();

if (is_int($propertyNameOrInfoIndex)) {
$info = $this->infos[$propertyNameOrInfoIndex];
if ($info['type'] != 'property') {
throw new Exception\InvalidArgumentException('Index of info offset is not about a property');
}
} elseif (is_string($propertyNameOrInfoIndex)) {
$propertyFound = false;
foreach ($this->infos as $info) {
if ($info['type'] === 'property' && $info['name'] === $propertyNameOrInfoIndex) {
$propertyFound = true;
break;
}
}
if (!$propertyFound) {
return false;
}
} else {
throw new Exception\InvalidArgumentException('Invalid property name of info index type. Must be of type int or string');
}
if (!isset($info)) {
return false;
}
$p = new PropertyScanner(
array_slice($this->tokens, $info['tokenStart'], $info['tokenEnd'] - $info['tokenStart'] + 1),
$this->nameInformation
);
$p->setClass($this->name);
$p->setScannerClass($this);
return $p;
}

public function getMethodNames()
{
$this->scan();
Expand Down

0 comments on commit 50319d4

Please sign in to comment.