Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Add DateTimeSelect element to form #2947

Closed
wants to merge 3 commits into
from
Jump to file or symbol
Failed to load files and symbols.
+793 −95
Split
@@ -97,8 +97,6 @@ class ClassScanner implements ScannerInterface
protected $infos = array();
/**
- * Constructor
- *
* @param array $classTokens
* @param NameInformation|null $nameInformation
* @return ClassScanner
@@ -110,8 +108,11 @@ public function __construct(array $classTokens, NameInformation $nameInformation
}
/**
+<<<<<<< HEAD
@Maks3w

Maks3w Nov 12, 2012

Member

Caution with this

+=======
* Get annotations
*
+>>>>>>> c7ab3b44304857c7271297becf651225c4bca6b4
* @param Annotation\AnnotationManager $annotationManager
* @return Annotation\AnnotationCollection
*/
@@ -124,22 +125,12 @@ public function getAnnotations(Annotation\AnnotationManager $annotationManager)
return new AnnotationScanner($annotationManager, $docComment, $this->nameInformation);
}
- /**
@Maks3w

Maks3w Nov 12, 2012

Member

Why remove this docblocks?

@bakura10

bakura10 Nov 12, 2012

Contributor

Don't know. Whenever I pull from develop I have a conflict in this file. I really don't know why.

- * Get doc comment
- *
- * @return null|string
- */
public function getDocComment()
{
$this->scan();
return $this->docComment;
}
- /**
- * Get doc block
- *
- * @return false|DocBlockScanner
- */
public function getDocBlock()
{
if (!$docComment = $this->getDocComment()) {
@@ -148,132 +139,72 @@ public function getDocBlock()
return new DocBlockScanner($docComment);
}
- /**
- * Get name
- *
- * @return null|string
- */
public function getName()
{
$this->scan();
return $this->name;
}
- /**
- * Get short name
- *
- * @return null|string
- */
public function getShortName()
{
$this->scan();
return $this->shortName;
}
- /**
- * Get line start
- *
- * @return int|null
- */
public function getLineStart()
{
$this->scan();
return $this->lineStart;
}
- /**
- * Get line end
- *
- * @return int|null
- */
public function getLineEnd()
{
$this->scan();
return $this->lineEnd;
}
- /**
- * Check for final
- *
- * @return bool
- */
public function isFinal()
{
$this->scan();
return $this->isFinal;
}
- /**
- * Check for instantiable
- *
- * @return bool
- */
public function isInstantiable()
{
$this->scan();
return (!$this->isAbstract && !$this->isInterface);
}
- /**
- * Check for abstract
- *
- * @return bool
- */
public function isAbstract()
{
$this->scan();
return $this->isAbstract;
}
- /**
- * Check for interface
- *
- * @return bool
- */
public function isInterface()
{
$this->scan();
return $this->isInterface;
}
- /**
- * Has parent class
- *
- * @return bool
- */
public function hasParentClass()
{
$this->scan();
return ($this->parentClass != null);
}
- /**
- * Get parent class
- *
- * @return null|string
- */
public function getParentClass()
{
$this->scan();
return $this->parentClass;
}
- /**
- * Get interfaces
- *
- * @return string[]
- */
public function getInterfaces()
{
$this->scan();
return $this->interfaces;
}
- /**
- * Get constants
- *
- * @return array
- */
public function getConstants()
{
$this->scan();
@@ -389,8 +320,6 @@ public function getMethodNames()
}
/**
- * Get methods
- *
* @return MethodScanner[]
*/
public function getMethods()
@@ -410,10 +339,8 @@ public function getMethods()
}
/**
- * Get method
- *
* @param string|int $methodNameOrInfoIndex
- * @throws Exception\InvalidArgumentException
+ * @throws \Zend\Code\Exception\InvalidArgumentException
* @return MethodScanner
*/
public function getMethod($methodNameOrInfoIndex)
@@ -450,12 +377,6 @@ public function getMethod($methodNameOrInfoIndex)
return $m;
}
- /**
- * Has method
- *
- * @param string $name
- * @return bool
- */
public function hasMethod($name)
{
$this->scan();
@@ -468,9 +389,6 @@ public function hasMethod($name)
return false;
}
- /**
- * Export
- */
public static function export()
{
// @todo
@@ -481,12 +399,6 @@ public function __toString()
// @todo
}
- /**
- * Scan
- *
- * @return void
- * @throws Exception\RuntimeException
- */
protected function scan()
{
if ($this->isScanned) {
@@ -530,7 +442,7 @@ protected function scan()
$tokenType = null;
$tokenContent = $token;
$tokenLine = $tokenLine + substr_count($lastTokenArray[1],
- "\n"); // adjust token line by last known newline count
+ "\n"); // adjust token line by last known newline count
} else {
$lastTokenArray = $token;
list($tokenType, $tokenContent, $tokenLine) = $token;
@@ -830,3 +742,4 @@ protected function scan()
}
}
+
Oops, something went wrong.