Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add php cs fixer #112

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Code Linting"
on:
push:
branches:
- master
pull_request:

jobs:
php-cs-fixer:
name: 'PHP-CS-Fixer'
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
tools: php-cs-fixer:3.49

- uses: actions/cache@v3
with:
path: '.php-cs-fixer.cache'
key: ${{ github.repository }}-8.2-phpcsfixer-${{ github.ref_name }}
restore-keys: |
${{ github.repository }}-8.2-phpcsfixer-master
${{ github.repository }}-8.2-phpcsfixer-

- name: Run PHP-CS-Fixer
run: 'php-cs-fixer fix --dry-run --show-progress=none --diff'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ tests/DoctrineTest/doctrine_tests/*
/tests/tmp
/tests/foo.sq3
/vendor/
.php-cs-fixer.cache
56 changes: 56 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php

$finder = PhpCsFixer\Finder::create()
->ignoreVCSIgnored(true)
->in(__DIR__.'/lib')
->in(__DIR__.'/tests')
->append([__FILE__])
// Exclude generated files (single files)
->notPath('should-be-ignored.php')
;

$config = new PhpCsFixer\Config();
$config->setRules([
'@PhpCsFixer' => true,
'@Symfony' => true,
'@PHP70Migration' => true,
'@PHP70Migration:risky' => true,
'@PHP71Migration' => true,
'@PHP74Migration' => true,
'@PHP74Migration:risky' => true,
'heredoc_indentation' => false,
'declare_strict_types' => false,
'void_return' => false,
'array_syntax' => [
'syntax' => 'short',
],
'method_argument_space' => [
'on_multiline' => 'ensure_fully_multiline',
],
'general_phpdoc_annotation_remove' => [
'annotations' => ['version', 'license', 'since'],
],
'phpdoc_no_package' => true,
'phpdoc_separation' => [
'groups' => [
[
'author',
],
[
'deprecated',
'see',
],
[
'param',
'return',
'throws',
],
],
],
])
->setRiskyAllowed(true)
->setCacheFile('.php-cs-fixer.cache')
->setFinder($finder)
;

return $config;
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,9 @@
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"scripts": {
"cs-fix-diff": "php-cs-fixer fix --dry-run --diff",
"cs-fix": "php-cs-fixer fix"
}
}
93 changes: 36 additions & 57 deletions lib/Doctrine/Access.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,19 @@
*/

/**
* Provides array access and property overload interface for Doctrine subclasses
* Provides array access and property overload interface for Doctrine subclasses.
*
* @see www.doctrine-project.org
*
* @package Doctrine
* @subpackage Access
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 1.0
* @version $Revision: 7490 $
* @author Konsta Vesterinen <[email protected]>
*/
abstract class Doctrine_Access extends Doctrine_Locator_Injectable implements ArrayAccess
{
/**
* Set an entire aray to the data
* Set an entire aray to the data.
*
* @param array $array An array of key => value pairs
* @return Doctrine_Access
* @param array $array An array of key => value pairs
* @return Doctrine_Access
*/
public function setArray(array $array)
{
Expand All @@ -48,48 +44,42 @@ public function setArray(array $array)
}

/**
* Set key and value to data
* Set key and value to data.
*
* @see set, offsetSet
* @param $name
* @param $value
* @return void
*/
public function __set($name, $value)
{
$this->set($name, $value);
}

/**
* Get key from data
* Get key from data.
*
* @see get, offsetGet
* @param mixed $name
* @return mixed
thePanz marked this conversation as resolved.
Show resolved Hide resolved
*/
public function __get($name)
{
return $this->get($name);
}

/**
* Check if key exists in data
* Check if key exists in data.
*
* @param string $name
* @return boolean whether or not this object contains $name
* @param string $name
* @return bool whether or not this object contains $name
*/
public function __isset($name)
{
return $this->contains($name);
}

/**
* Remove key from data
* Remove key from data.
*
* @param string $name
* @return void
* @param string $name
*/
#[\ReturnTypeWillChange]
#[ReturnTypeWillChange]
public function __unset($name)
{
return $this->remove($name);
Expand All @@ -98,16 +88,13 @@ public function __unset($name)
/**
* @return bool
*/
#[\ReturnTypeWillChange]
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return $this->contains($offset);
}

/**
* @return mixed
*/
#[\ReturnTypeWillChange]
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
// array notation with no index was causing 'undefined variable: $offset' notices in php7,
Expand All @@ -116,84 +103,76 @@ public function offsetGet($offset)
if (!isset($offset)) {
return $this->get(null);
}

return $this->get($offset);
}

/**
* @return void
*/
#[\ReturnTypeWillChange]
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
if ( ! isset($offset)) {
if (!isset($offset)) {
$this->add($value);
} else {
$this->set($offset, $value);
}
}

/**
* @return void
*/
#[\ReturnTypeWillChange]
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
$this->remove($offset);
}

/**
* Remove the element with the specified offset
* Remove the element with the specified offset.
*
* @param mixed $offset The offset to remove
* @return bool True if removed otherwise false
* @param mixed $offset The offset to remove
* @return bool True if removed otherwise false
*/
public function remove($offset)
{
throw new Doctrine_Exception('Remove is not supported for ' . get_class($this));
throw new Doctrine_Exception('Remove is not supported for '.get_class($this));
}

/**
* Return the element with the specified offset
* Return the element with the specified offset.
*
* @param mixed $offset The offset to return
* @return mixed
* @param mixed $offset The offset to return
*/
public function get($offset)
{
throw new Doctrine_Exception('Get is not supported for ' . get_class($this));
throw new Doctrine_Exception('Get is not supported for '.get_class($this));
}

/**
* Set the offset to the value
* Set the offset to the value.
*
* @param mixed $offset The offset to set
* @param mixed $value The value to set the offset to
*
* @param mixed $value The value to set the offset to
*/
public function set($offset, $value)
{
throw new Doctrine_Exception('Set is not supported for ' . get_class($this));
throw new Doctrine_Exception('Set is not supported for '.get_class($this));
}

/**
* Check if the specified offset exists
* Check if the specified offset exists.
*
* @param mixed $offset The offset to check
* @return boolean True if exists otherwise false
* @param mixed $offset The offset to check
* @return bool True if exists otherwise false
*/
public function contains($offset)
{
throw new Doctrine_Exception('Contains is not supported for ' . get_class($this));
throw new Doctrine_Exception('Contains is not supported for '.get_class($this));
}

/**
* Add the value
* Add the value.
*
* @param mixed $value The value to add
* @return void
*/
public function add($value)
{
throw new Doctrine_Exception('Add is not supported for ' . get_class($this));
throw new Doctrine_Exception('Add is not supported for '.get_class($this));
}
}
13 changes: 5 additions & 8 deletions lib/Doctrine/Adapter/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@
*/

/**
* Doctrine_Adapter exception class
* Doctrine_Adapter exception class.
*
* @see www.doctrine-project.org
*
* @package Doctrine
* @subpackage Adapter
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <[email protected]>
*/
class Doctrine_Adapter_Exception extends Doctrine_Exception
{ }
{
}
23 changes: 15 additions & 8 deletions lib/Doctrine/Adapter/Interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,35 @@
*/

/**
* This adapter interface should be implemented by all custom adapters
* This adapter interface should be implemented by all custom adapters.
*
* @author Konsta Vesterinen <[email protected]>
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @package Doctrine
* @subpackage Adapter
* @link www.doctrine-project.org
* @since 1.0
* @version $Revision: 7490 $
*
* @see www.doctrine-project.org
*/
interface Doctrine_Adapter_Interface
{
public function prepare($prepareString);

public function query($queryString);

public function quote($input);

public function exec($statement);

public function lastInsertId();

public function beginTransaction();

public function commit();

public function rollBack();

public function errorCode();

public function errorInfo();

public function setAttribute($attribute, $value);

public function getAttribute($attribute);
}
}
Loading