3 # EXPERIMENTAL script to enforce coding style guidelines
4 # There are still things to fix
5 # DO NOT APPLY BLINDLY!
9 # * Indentation is wrong inside parenthesis (next line starts with an
10 # extra tab rather than aligned with the first element in the paren)
16 file=$(readlink -e $arg)
18 if [ ! -e $file ] ; then
25 if [ ! -x /tmp/PHP_Beautifier/scripts/php_beautifier ] ; then
27 git clone https://github.com/jespino/PHP_Beautifier.git
29 git checkout 15e6c66d2b2473cd3487c86ab9b2e3d5ed567ee7
32 diff --git a/Beautifier/Filter/Default.filter.php b/Beautifier/Filter/Default.filter.php
33 index 3df2578..857b584 100755
34 --- a/Beautifier/Filter/Default.filter.php
35 +++ b/Beautifier/Filter/Default.filter.php
37 final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
39 protected $sDescription = 'Default Filter for PHP_Beautifier';
40 + private $paren_level = 0;
44 @@ -192,6 +193,8 @@ final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
45 function t_parenthesis_open($sTag)
47 $this->oBeaut->add($sTag);
48 + $this->oBeaut->incIndent();
49 + $this->paren_level++;
53 @@ -210,7 +213,8 @@ final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
54 if (!$this->oBeaut->isNextTokenContent(';')) {
55 $this->oBeaut->add(' ');
58 + $this->oBeaut->decIndent();
59 + $this->paren_level--;
63 @@ -231,9 +235,6 @@ final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
64 $this->oBeaut->add($sTag);
66 $this->oBeaut->incIndent();
67 - if ($this->oBeaut->getControlSeq() == T_SWITCH) {
68 - $this->oBeaut->incIndent();
70 $this->oBeaut->addNewLineIndent();
73 @@ -254,9 +255,6 @@ final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
75 $this->oBeaut->removeWhitespace();
76 $this->oBeaut->decIndent();
77 - if ($this->oBeaut->getControlSeq() == T_SWITCH) {
78 - $this->oBeaut->decIndent();
80 $this->oBeaut->addNewLineIndent();
81 $this->oBeaut->add($sTag);
82 if ($this->oBeaut->getControlSeq() == T_DO) {
83 @@ -318,7 +316,11 @@ final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
84 function t_whitespace($sTag)
88 + if ($this->paren_level) {
93 if($this->oBeaut->isPreviousTokenConstant(T_COMMENT)) {
94 $prevToken = $this->oBeaut->getPreviousTokenContent(1);
95 $tokenEnd = substr($prevToken,strlen($prevToken)-2);
96 @@ -678,10 +680,8 @@ final class PHP_Beautifier_Filter_Default extends PHP_Beautifier_Filter
98 if ($this->oBeaut->getControlSeq() == T_SWITCH) {
99 $this->oBeaut->removeWhitespace();
100 - $this->oBeaut->decIndent();
101 $this->oBeaut->addNewLineIndent();
102 $this->oBeaut->add($sTag);
103 - $this->oBeaut->incIndent();
105 $this->oBeaut->add($sTag);
107 diff --git a/Beautifier/Filter/IndentStyles.filter.php b/Beautifier/Filter/IndentStyles.filter.php
108 index fa98c45..ee57eb3 100755
109 --- a/Beautifier/Filter/IndentStyles.filter.php
110 +++ b/Beautifier/Filter/IndentStyles.filter.php
111 @@ -265,7 +265,7 @@ class PHP_Beautifier_Filter_IndentStyles extends PHP_Beautifier_Filter
113 if ($this->oBeaut->getPreviousTokenContent() == '}') {
114 $this->oBeaut->removeWhitespace();
115 - $this->oBeaut->addNewLineIndent();
116 + $this->oBeaut->add(' ');
117 $this->oBeaut->add(trim($sTag));
118 if (!$this->oBeaut->isNextTokenContent('{')) {
119 $this->oBeaut->add(' ');
123 cd /tmp/PHP_Beautifier
124 php scripts/php_beautifier --filters "IndentStyles(style=k&r)" -t 1 -v $file $dir/