srchub Commit Details

Date:

2015-10-15 21:24:05 (9 years 2 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

0b6fa7c64dff91209a618a5f975471898d294616

Parents:

e130ec13e2c5cfd1ae574b0f504baf37539c2f0e

Message:

Inspector cleanup

Changes:

File differences

-568
569 569
570 570
571
571 572
572 573
573 574
... ...
641 642
642 643
643 644
644 
645
645 646
646 647
647 648
+        $keyGuard = new IDF_Plugin_SyncMonotone_ModelGuard($key);␊
␊
        foreach (Pluf::factory('IDF_Project')->getList() as $project) {␊
            /** @var \IDF_Project $project */␊
            $conf = new IDF_Conf();␊
            $conf->setProject($project);␊
            $scm = $conf->getVal('scm', 'mtn');␊

                                      $read_perms, LOCK_EX) === false) {␊
                    $this->_diagnoseProblem(sprintf(␊
                        __('Could not write read-permissions for project "%s"'),␊
                        $shortname␊
                        $project->shortname␊
                    ));␊
                }␊
            }␊
 ...
         $keyGuard = new IDF_Plugin_SyncMonotone_ModelGuard($key);␊
 ␊
         foreach (Pluf::factory('IDF_Project')->getList() as $project) {␊
+            /** @var \IDF_Project $project */␊
             $conf = new IDF_Conf();␊
             $conf->setProject($project);␊
             $scm = $conf->getVal('scm', 'mtn');␊
                                       $read_perms, LOCK_EX) === false) {␊
                     $this->_diagnoseProblem(sprintf(␊
                         __('Could not write read-permissions for project "%s"'),␊
-                        $shortname␊
+                        $project->shortname␊
                     ));␊
                 }␊
             }␊

-195
196 196
197 197
198 
198
199 199
200 200
201 201
+␊
    function __toString()␊
    {␊
        return '<Pluf_DB_MySQL('.$this->con_id.')>';␊
        return '<Pluf_DB_MySQL('.$this->con_id->info.')>';␊
    }␊
␊
}␊
 ␊
     function __toString()␊
     {␊
-        return '<Pluf_DB_MySQL('.$this->con_id.')>';␊
+        return '<Pluf_DB_MySQL('.$this->con_id->info.')>';␊
     }␊
 ␊
 }␊

-163
164 164
165 165
166 
166
167
167 168
168 169
169 170
+␊
    function __toString()␊
    {␊
        return '<Pluf_DB_SQLite('.$this->con_id.')>';␊
        // According to PHPStorm \PDO does not define __toString␊
        return '<Pluf_DB_SQLite()>';␊
    }␊
␊
}␊
 ␊
     function __toString()␊
     {␊
-        return '<Pluf_DB_SQLite('.$this->con_id.')>';␊
+        // According to PHPStorm \PDO does not define __toString␊
+        return '<Pluf_DB_SQLite()>';␊
     }␊
 ␊
 }␊

-56
57 57
58 58
59 
59
60 60
61 61
62 62
+                            str_pad($day,   2, '0', STR_PAD_LEFT).' '.␊
                            str_pad($date['tm_hour'], 2, '0', STR_PAD_LEFT).':'.␊
                            str_pad($date['tm_min'],  2, '0', STR_PAD_LEFT).':';␊
                            str_pad($date['tm_sec'],  2, '0', STD_PAD_LEFT);␊
                            str_pad($date['tm_sec'],  2, '0', STR_PAD_LEFT);␊
                    ␊
                    // we internally use GMT, so we convert it to a GMT date.␊
                    return gmdate('Y-m-d H:i:s', strtotime($date));␊
                             str_pad($day,   2, '0', STR_PAD_LEFT).' '.␊
                             str_pad($date['tm_hour'], 2, '0', STR_PAD_LEFT).':'.␊
                             str_pad($date['tm_min'],  2, '0', STR_PAD_LEFT).':';␊
-                            str_pad($date['tm_sec'],  2, '0', STD_PAD_LEFT);␊
+                            str_pad($date['tm_sec'],  2, '0', STR_PAD_LEFT);␊
                     ␊
                     // we internally use GMT, so we convert it to a GMT date.␊
                     return gmdate('Y-m-d H:i:s', strtotime($date));␊

-65
66 66
67 67
68 
68
69 69
70 70
71 71
+    public function idForLabel($id)␊
    {␊
        if ($id) {␊
            $id += '_0';␊
            $id .= '_0';␊
        }␊
        return $id;␊
    }␊
     public function idForLabel($id)␊
     {␊
         if ($id) {␊
-            $id += '_0';␊
+            $id .= '_0';␊
         }␊
         return $id;␊
     }␊

-147
148 148
149 149
150 
150
151 151
152 152
153 153
+     */␊
    public static function log($message)␊
    {␊
        return self::_log(self::ALL, $message);␊
        self::_log(self::ALL, $message);␊
    }␊
␊
    /**␊
      */␊
     public static function log($message)␊
     {␊
-        return self::_log(self::ALL, $message);␊
+        self::_log(self::ALL, $message);␊
     }␊
 ␊
     /**␊

-42
43 43
44 44
45 
45
46 46
47 47
48 48
+    {␊
        if (isset($response) && !isset($response->status_code))␊
            return $response;␊
        ␊
␊
        if (!Pluf::f('google_analytics_id', false)) {␊
            return $response;␊
        }␊
     {␊
         if (isset($response) && !isset($response->status_code))␊
             return $response;␊
-        ␊
+␊
         if (!Pluf::f('google_analytics_id', false)) {␊
             return $response;␊
         }␊

-153
154 154
155 155
156 
157 156
158 157
159 158
+        } else {␊
            throw new Exception(sprintf(__('Cannot write the compiled template: %s'), $this->compiled_template));␊
        }␊
        return false;␊
    }␊
␊
    public static function markSafe($string)␊
         } else {␊
             throw new Exception(sprintf(__('Cannot write the compiled template: %s'), $this->compiled_template));␊
         }␊
-        return false;␊
     }␊
 ␊
     public static function markSafe($string)␊

-402
403 403
404 404
405 
405
406 406
407 407
408 408
+                    $result.=$tok;␊
                } elseif ($tok ==']') {␊
                    $result.=$tok;␊
                } elseif ($getAsArray && $tok == ',') {␊
                } elseif ($tok == ',') { // $getAsArray not defined anywhere...␊
                    $results[]=$result;␊
                    $result='';␊
                } else {␊
                     $result.=$tok;␊
                 } elseif ($tok ==']') {␊
                     $result.=$tok;␊
-                } elseif ($getAsArray && $tok == ',') {␊
+                } elseif ($tok == ',') { // $getAsArray not defined anywhere...␊
                     $results[]=$result;␊
                     $result='';␊
                 } else {␊

-88
89 89
90 90
91 
92 
91
+echo "\n";␊
echo 'Compiled files: '.count($files)."\n";␊
file_put_contents($output_file, '<?php '.implode("\n", $output).' ?>');␊
echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n");␊
?>
echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n");
 echo "\n";␊
 echo 'Compiled files: '.count($files)."\n";␊
 file_put_contents($output_file, '<?php '.implode("\n", $output).' ?>');␊
-echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n");␊
-?>
+echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n");

Download the corresponding diff file

srchub

File differences

Branches