Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/cs' into develop

  • Loading branch information...
commit 7047755e4a2f86be0fd62716dc15333c4a98560d 2 parents 9ce8939 + cc80c42
@weierophinney weierophinney authored
View
2  library/Zend/Code/Scanner/PropertyScanner.php
@@ -282,4 +282,4 @@ protected function scan()
$this->isScanned = true;
}
-}
+}
View
1  library/Zend/Form/Element/DateSelect.php
@@ -155,4 +155,3 @@ public function getInputSpecification()
);
}
}
-
View
1  library/Zend/Form/Element/MonthSelect.php
@@ -294,4 +294,3 @@ public function getInputSpecification()
);
}
}
-
View
1  library/Zend/Form/View/Helper/FormDateSelect.php
@@ -107,4 +107,3 @@ protected function getDaysOptions($pattern)
return $result;
}
}
-
View
1  library/Zend/Form/View/Helper/FormMonthSelect.php
@@ -281,4 +281,3 @@ protected function getSelectElementHelper()
return $this->selectHelper;
}
}
-
View
2  library/Zend/Permissions/Acl/AclInterface.php
@@ -54,4 +54,4 @@ public function hasResource($resource);
* @return boolean
*/
public function isAllowed($role = null, $resource = null, $privilege = null);
-}
+}
View
1  library/Zend/View/Helper/HeadLink.php
@@ -456,4 +456,3 @@ public function createDataNext(array $args)
return $this->createData($attributes);
}
}
-
View
2  tests/ZendTest/Code/Annotation/TestAsset/EntityWithAnnotations.php
@@ -25,4 +25,4 @@ class EntityWithAnnotations
* @Bogus(does not exist)
*/
public $test;
-}
+}
View
2  tests/ZendTest/Serializer/Adapter/MsgPackTest.php
@@ -151,4 +151,4 @@ public function testUnserialzeInvalid()
);
$this->adapter->unserialize($value);
}
-}
+}
View
2  tests/ZendTest/Stdlib/Strategy/SerializableStrategyTest.php
@@ -50,4 +50,4 @@ public function testCanUnserialize()
$serialized = $serializerStrategy->hydrate('s:3:"foo";');
$this->assertEquals($serialized, 'foo');
}
-}
+}
Please sign in to comment.
Something went wrong with that request. Please try again.