Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into fix/annotaion_input

  • Loading branch information...
2 parents 68cace9 + 0598337 commit ffbf2e8c0d6d805eacc9197b62ed0b9f9bd77241 @thestanislav committed Aug 29, 2013
@@ -9,7 +9,7 @@
namespace Zend\Code\Generator;
-use Zend\Code\Generator\DocBlock\Tag as DockBlockTag;
+use Zend\Code\Generator\DocBlock\Tag as DocBlockTag;
use Zend\Code\Reflection\DocBlockReflection;
class DocBlockGenerator extends AbstractGenerator
@@ -56,7 +56,7 @@ public static function fromReflection(DocBlockReflection $reflectionDocBlock)
$docBlock->setLongDescription($reflectionDocBlock->getLongDescription());
foreach ($reflectionDocBlock->getTags() as $tag) {
- $docBlock->setTag(DockBlockTag::fromReflection($tag));
+ $docBlock->setTag(DocBlockTag::fromReflection($tag));
}
return $docBlock;
@@ -162,15 +162,15 @@ public function setTags(array $tags)
}
/**
- * @param array|DockBlockTag $tag
+ * @param array|DocBlockTag $tag
* @throws Exception\InvalidArgumentException
* @return DocBlockGenerator
*/
public function setTag($tag)
{
if (is_array($tag)) {
- $tag = new DockBlockTag($tag);
- } elseif (!$tag instanceof DockBlockTag) {
+ $tag = new DocBlockTag($tag);
+ } elseif (!$tag instanceof DocBlockTag) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects either an array of method options or an instance of %s\DocBlock\Tag',
__METHOD__,
@@ -183,7 +183,7 @@ public function setTag($tag)
}
/**
- * @return DockBlockTag[]
+ * @return DocBlockTag[]
*/
public function getTags()
{
@@ -254,8 +254,9 @@ protected function processClass($class)
preg_match($interfaceInjectorPattern, $rIface->getName(), $matches);
if ($matches) {
foreach ($rIface->getMethods() as $rMethod) {
- if ($rMethod->getName() === '__construct') {
+ if (($rMethod->getName() === '__construct') || !count($rMethod->getParameters())) {
// constructor not allowed in interfaces
+ // ignore methods without parameters
continue;
}
$def['methods'][$rMethod->getName()] = true;
@@ -302,8 +302,9 @@ protected function processClass($class)
preg_match($interfaceInjectorPattern, $rIface->getName(), $matches);
if ($matches) {
foreach ($rIface->getMethods() as $rMethod) {
- if ($rMethod->getName() === '__construct') {
+ if (($rMethod->getName() === '__construct') || !count($rMethod->getParameters())) {
// constructor not allowed in interfaces
+ // Don't call interface methods without a parameter (Some aware interfaces define setters in ZF2)
continue;
}
$def['methods'][$rMethod->getName()] = Di::METHOD_IS_AWARE;
@@ -179,16 +179,16 @@
// Zend_Validate_Hostname
"Invalid type given. String expected" => "Chybný typ. Bol očakávaný reťazec",
- "'%value%' appears to be an IP address, but IP addresses are not allowed" => "'%value%' vyzerá ako IP adresa, ale tie nie sú dovolené",
- "'%value%' appears to be a DNS hostname but cannot match TLD against known list" => "'%value%' vyzerá ako hostname, ale nemohol byť overený voči známym TLD",
- "'%value%' appears to be a DNS hostname but contains a dash in an invalid position" => "'%value%' vyzerá ako hostname, ale obsahuje pomlčku na nedovolenom mieste",
- "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "'%value%' vyzerá ako hostname, ale nezodpovedá formátu hostname pre '%tld%'",
- "'%value%' appears to be a DNS hostname but cannot extract TLD part" => "'%value%' síce vyzerá ako hostname, ale nemožno určiť TLD",
- "'%value%' does not match the expected structure for a DNS hostname" => "'%value%' nezodpovedá očakávanej štruktúre hostname",
- "'%value%' does not appear to be a valid local network name" => "'%value%' nevyzerá ako platné sieťové meno",
- "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' vyzerá ako hostname lokálnej siete, tie ale nie sú povolené",
- "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" => "'%value%' vyzerá ako DNS hostname ale zadanú punycode notáciu nie je možné dekódovať",
- "'%value%' does not appear to be a valid URI hostname" => "'%value%' nevyzerá ako platné URI hostname",
+ "The input appears to be an IP address, but IP addresses are not allowed" => "Zadaná hodnota vyzerá ako IP adresa, ale tie nie sú dovolené",
+ "The input appears to be a DNS hostname but cannot match TLD against known list" => "Zadaná hodnota vyzerá ako hostname, ale nemohol byť overený voči známym TLD",
+ "The input appears to be a DNS hostname but contains a dash in an invalid position" => "Zadaná hodnota vyzerá ako hostname, ale obsahuje pomlčku na nedovolenom mieste",
+ "The input appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "Zadaná hodnota vyzerá ako hostname, ale nezodpovedá formátu hostname pre '%tld%'",
+ "The input appears to be a DNS hostname but cannot extract TLD part" => "Zadaná hodnota síce vyzerá ako hostname, ale nemožno určiť TLD",
+ "The input does not match the expected structure for a DNS hostname" => "Zadaná hodnota nezodpovedá očakávanej štruktúre hostname",
+ "The input does not appear to be a valid local network name" => "Zadaná hodnota nevyzerá ako platné sieťové meno",
+ "The input appears to be a local network name but local network names are not allowed" => "Zadaná hodnota vyzerá ako hostname lokálnej siete, tie ale nie sú povolené",
+ "The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "Zadaná hodnota vyzerá ako DNS hostname ale zadanú punycode notáciu nie je možné dekódovať",
+ "The input does not appear to be a valid URI hostname" => "Zadaná hodnota nevyzerá ako platné URI hostname",
// Zend_Validate_Iban
"Unknown country within the IBAN '%value%'" => "Neznámý štát v IBAN '%value%'",
@@ -11,12 +11,12 @@
* EN-Revision: 30.Jul.2011
*/
return array(
- // Zend_Captcha_ReCaptcha
+ // Zend\Captcha\ReCaptcha
"Missing captcha fields" => "Manjka varnostna koda",
"Failed to validate captcha" => "Varnostne kode ni bilo mogoče preveriti",
"Captcha value is wrong: %value%" => "Napačna varnostna koda: %value%",
- // Zend_Captcha_Word
+ // Zend\Captcha\Word
"Empty captcha value" => "Prazna varnostna koda",
"Captcha ID field is missing" => "Polje ID varnostne kode manjka",
"Captcha value is wrong" => "Varnostna koda je napačna",
Oops, something went wrong.

0 comments on commit ffbf2e8

Please sign in to comment.