зеркало из https://github.com/nextcloud/notes.git
style and travis fixes
This commit is contained in:
Bernhard Posselt
Родитель
eb66c187ff
Коммит
29f14b3cad
|
|
@ -21,6 +21,7 @@ before_install:
|
|||
- export DISPLAY=:99.0
|
||||
- export CHROME_BIN=chromium-browser
|
||||
- sh -e /etc/init.d/xvfb start
|
||||
- sudo apt-get update
|
||||
- sudo apt-get install firefox chromium-browser
|
||||
- wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh
|
||||
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
|
||||
|
|
|
|||
216
db/entity.php
216
db/entity.php
|
|
@ -1,216 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Notes
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
*
|
||||
* @author Bernhard Posselt <dev@bernhard-posselt.com>
|
||||
* @copyright Bernhard Posselt 2012, 2014
|
||||
*/
|
||||
|
||||
namespace OCA\Notes\Db;
|
||||
|
||||
/**
|
||||
* Class Entity
|
||||
*
|
||||
* @package OCA\Notes\Db
|
||||
*/
|
||||
abstract class Entity {
|
||||
/** @var int */
|
||||
public $id;
|
||||
/** @var array */
|
||||
private $_updatedFields = [];
|
||||
/** @var array */
|
||||
private $_fieldTypes = ['id' => 'integer'];
|
||||
|
||||
/**
|
||||
* Simple alternative constructor for building entities from a request
|
||||
* @param array $params the array which was obtained via $this->params('key')
|
||||
* in the controller
|
||||
* @return Entity
|
||||
*/
|
||||
public static function fromParams(array $params) {
|
||||
$instance = new static();
|
||||
|
||||
foreach($params as $key => $value) {
|
||||
$method = 'set' . ucfirst($key);
|
||||
$instance->$method($value);
|
||||
}
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Maps the keys of the row array to the attributes
|
||||
* @param array $row the row to map onto the entity
|
||||
* @return static
|
||||
*/
|
||||
public static function fromRow(array $row){
|
||||
$instance = new static();
|
||||
|
||||
foreach($row as $key => $value){
|
||||
$prop = ucfirst($instance->columnToProperty($key));
|
||||
$setter = 'set' . $prop;
|
||||
$instance->$setter($value);
|
||||
}
|
||||
|
||||
$instance->resetUpdatedFields();
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array array with attribute and type
|
||||
*/
|
||||
public function getFieldTypes() {
|
||||
return $this->_fieldTypes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Marks the entity as clean needed for setting the id after the insertion
|
||||
*/
|
||||
public function resetUpdatedFields(){
|
||||
$this->_updatedFields = array();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $name
|
||||
* @param $args
|
||||
*/
|
||||
protected function setter($name, $args) {
|
||||
// setters should only work for existing attributes
|
||||
if(property_exists($this, $name)){
|
||||
$this->markFieldUpdated($name);
|
||||
|
||||
// if type definition exists, cast to correct type
|
||||
if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
|
||||
settype($args[0], $this->_fieldTypes[$name]);
|
||||
}
|
||||
$this->$name = $args[0];
|
||||
|
||||
} else {
|
||||
throw new \BadFunctionCallException($name .
|
||||
' is not a valid attribute');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $name
|
||||
* @return mixed
|
||||
*/
|
||||
protected function getter($name) {
|
||||
// getters should only work for existing attributes
|
||||
if(property_exists($this, $name)){
|
||||
return $this->$name;
|
||||
} else {
|
||||
throw new \BadFunctionCallException($name .
|
||||
' is not a valid attribute');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Each time a setter is called, push the part after set
|
||||
* into an array: for instance setId will save Id in the
|
||||
* updated fields array so it can be easily used to create the
|
||||
* getter method
|
||||
*/
|
||||
public function __call($methodName, $args){
|
||||
$attr = lcfirst( substr($methodName, 3) );
|
||||
|
||||
if(strpos($methodName, 'set') === 0){
|
||||
$this->setter($attr, $args);
|
||||
} elseif(strpos($methodName, 'get') === 0) {
|
||||
return $this->getter($attr);
|
||||
} else {
|
||||
throw new \BadFunctionCallException($methodName .
|
||||
' does not exist');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark am attribute as updated
|
||||
* @param string $attribute the name of the attribute
|
||||
*/
|
||||
protected function markFieldUpdated($attribute){
|
||||
$this->_updatedFields[$attribute] = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Transform a database columnname to a property
|
||||
* @param string $columnName the name of the column
|
||||
* @return string the property name
|
||||
*/
|
||||
public function columnToProperty($columnName){
|
||||
$parts = explode('_', $columnName);
|
||||
$property = null;
|
||||
|
||||
foreach($parts as $part){
|
||||
if($property === null){
|
||||
$property = $part;
|
||||
} else {
|
||||
$property .= ucfirst($part);
|
||||
}
|
||||
}
|
||||
|
||||
return $property;
|
||||
}
|
||||
|
||||
/**
|
||||
* Transform a property to a database column name
|
||||
* @param string $property the name of the property
|
||||
* @return string the column name
|
||||
*/
|
||||
public function propertyToColumn($property){
|
||||
$parts = preg_split('/(?=[A-Z])/', $property);
|
||||
$column = null;
|
||||
|
||||
foreach($parts as $part){
|
||||
if($column === null){
|
||||
$column = $part;
|
||||
} else {
|
||||
$column .= '_' . lcfirst($part);
|
||||
}
|
||||
}
|
||||
|
||||
return $column;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array array of updated fields for update query
|
||||
*/
|
||||
public function getUpdatedFields(){
|
||||
return $this->_updatedFields;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds type information for a field so that its automatically casted to
|
||||
* that value once its being returned from the database
|
||||
* @param string $fieldName the name of the attribute
|
||||
* @param string $type the type which will be used to call settype()
|
||||
*/
|
||||
protected function addType($fieldName, $type){
|
||||
$this->_fieldTypes[$fieldName] = $type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Slugify the value of a given attribute
|
||||
* Warning: This doesn't result in a unique value
|
||||
* @param string $attributeName the name of the attribute, which value should be slugified
|
||||
* @return string slugified value
|
||||
*/
|
||||
public function slugify($attributeName){
|
||||
// toSlug should only work for existing attributes
|
||||
if(property_exists($this, $attributeName)){
|
||||
$value = $this->$attributeName;
|
||||
// replace everything except alphanumeric with a single '-'
|
||||
$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
|
||||
$value = strtolower($value);
|
||||
// trim '-'
|
||||
return trim($value, '-');
|
||||
} else {
|
||||
throw new \BadFunctionCallException($attributeName .
|
||||
' is not a valid attribute');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -12,10 +12,16 @@
|
|||
namespace OCA\Notes\Db;
|
||||
|
||||
use OCP\Files\File;
|
||||
use OCP\AppFramework\Db\Entity;
|
||||
|
||||
/**
|
||||
* Class Note
|
||||
*
|
||||
* @method integer getId()
|
||||
* @method void setId(integer $value)
|
||||
* @method integer getModified()
|
||||
* @method void setModified(integer $value)
|
||||
* @method integer getContent()
|
||||
* @method void setContent(integer $value)
|
||||
* @package OCA\Notes\Db
|
||||
*/
|
||||
class Note extends Entity {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<phpunit bootstrap="tests/unit/bootstrap.php">
|
||||
<testsuites>
|
||||
<testsuite name="unit">
|
||||
<directory>./tests/unit</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
</phpunit>
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
filter:
|
||||
excluded_paths:
|
||||
- 'js/vendor/*'
|
||||
- 'js/build/*'
|
||||
- 'l10n/*'
|
||||
- 'tests/*'
|
||||
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ class NotesService {
|
|||
* @param int $id
|
||||
* @param string $userId
|
||||
* @throws NoteDoesNotExistException
|
||||
* @return \OCP\Files\Node[]
|
||||
* @return \OCP\Files\File
|
||||
*/
|
||||
private function getFileById ($folder, $id, $userId) {
|
||||
$file = $folder->getById($id);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче