Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/cs' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Sep 25, 2012
2 parents 9ce8939 + cc80c42 commit 7047755
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion library/Zend/Code/Scanner/PropertyScanner.php
Expand Up @@ -282,4 +282,4 @@ protected function scan()

$this->isScanned = true;
}
}
}
1 change: 0 additions & 1 deletion library/Zend/Form/Element/DateSelect.php
Expand Up @@ -155,4 +155,3 @@ public function getInputSpecification()
);
}
}

1 change: 0 additions & 1 deletion library/Zend/Form/Element/MonthSelect.php
Expand Up @@ -294,4 +294,3 @@ public function getInputSpecification()
);
}
}

1 change: 0 additions & 1 deletion library/Zend/Form/View/Helper/FormDateSelect.php
Expand Up @@ -107,4 +107,3 @@ protected function getDaysOptions($pattern)
return $result;
}
}

1 change: 0 additions & 1 deletion library/Zend/Form/View/Helper/FormMonthSelect.php
Expand Up @@ -281,4 +281,3 @@ protected function getSelectElementHelper()
return $this->selectHelper;
}
}

2 changes: 1 addition & 1 deletion library/Zend/Permissions/Acl/AclInterface.php
Expand Up @@ -54,4 +54,4 @@ public function hasResource($resource);
* @return boolean
*/
public function isAllowed($role = null, $resource = null, $privilege = null);
}
}
1 change: 0 additions & 1 deletion library/Zend/View/Helper/HeadLink.php
Expand Up @@ -456,4 +456,3 @@ public function createDataNext(array $args)
return $this->createData($attributes);
}
}

Expand Up @@ -25,4 +25,4 @@ class EntityWithAnnotations
* @Bogus(does not exist)
*/
public $test;
}
}
2 changes: 1 addition & 1 deletion tests/ZendTest/Serializer/Adapter/MsgPackTest.php
Expand Up @@ -151,4 +151,4 @@ public function testUnserialzeInvalid()
);
$this->adapter->unserialize($value);
}
}
}
Expand Up @@ -50,4 +50,4 @@ public function testCanUnserialize()
$serialized = $serializerStrategy->hydrate('s:3:"foo";');
$this->assertEquals($serialized, 'foo');
}
}
}

0 comments on commit 7047755

Please sign in to comment.