Allow to get scm info from files; update copyright year; remove php c…

…losing tag
ezpublishlegacy · Mar 31, 2017 · e7260dc · e7260dc
1 parent 04e3cb5
commit e7260dc
Show file tree

Hide file tree

Showing 85 changed files with 160 additions and 163 deletions.
diff --git a/autoloads/eztemplateautoload.php b/autoloads/eztemplateautoload.php
@@ -4,6 +4,3 @@
 $eZTemplateOperatorArray[] = array( 'script' => 'extension/ggsysinfo/autoloads/ggsysinfotemplateoperators.php',
                                     'class' => 'ggSysinfoTemplateOperators',
                                     'operator_names' => array_keys( ggSysinfoTemplateOperators::$operators ) );
-
-
-?>
diff --git a/autoloads/ggsysinfotemplateoperators.php b/autoloads/ggsysinfotemplateoperators.php
@@ -89,5 +89,3 @@ public function modify( $tpl, $operatorName, $operatorParameters, $rootNamespace
     }
 
 }
-
-?>
diff --git a/bin/php/report.php b/bin/php/report.php
@@ -8,7 +8,7 @@
  * also this script uses a custom autoloader for php classes
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2012-2016
+ * @copyright (C) G. Giunta 2012-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  *
  * @todo add options to let users to select which tests to run when running status report (ALL by default)
@@ -196,5 +196,3 @@ public static function autoloadCallback( $php, $label )
         }
     }
 }
-
-?>
diff --git a/classes/contentstatsgatherer.php b/classes/contentstatsgatherer.php
@@ -2,7 +2,7 @@
 /**
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2012-2016
+ * @copyright (C) G. Giunta 2012-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  *
  * @todo add more classes of content that have no stats in main admin interface
@@ -85,5 +85,3 @@ static function gather()
         return $contentList;
     }
 }
-
-?>
diff --git a/classes/dbchecker.php b/classes/dbchecker.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2012-2016
+ * @copyright (C) G. Giunta 2012-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 
@@ -47,4 +47,3 @@ static function checkDatabase()
 
 
 }
-?>
diff --git a/classes/ezcGraphGdDriver2.php b/classes/ezcGraphGdDriver2.php
@@ -13,5 +13,3 @@ public function render( $file )
         parent::render( $file );
     }
 }
-
-?>
diff --git a/classes/ezinactiveextensionloader.php b/classes/ezinactiveextensionloader.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/ezlogsgrapher.php b/classes/ezlogsgrapher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2008-2016
+ * @copyright (C) G. Giunta 2008-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 
@@ -184,4 +184,3 @@ static function lastError()
         return self::$lastError;
     }
 }
-?>
diff --git a/classes/ezmodulelister.php b/classes/ezmodulelister.php
@@ -4,7 +4,7 @@
  * Copied here from ezwebservicesapi and renamed to avoid clashes
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2010-2016
+ * @copyright (C) G. Giunta 2010-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 
@@ -39,5 +39,3 @@ static function getModuleList()
 
     }*/
 }
-
-?>
diff --git a/classes/ezsysinfoclustermanager.php b/classes/ezsysinfoclustermanager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/ezsysinfomodule.php b/classes/ezsysinfomodule.php
@@ -3,7 +3,7 @@
  * Class used to help managing in a single place all module/view info
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2010-2016
+ * @copyright (C) G. Giunta 2010-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/ezsysinfoscmchecker.php b/classes/ezsysinfoscmchecker.php
@@ -20,7 +20,6 @@ public function getDescription()
     }
 
     /**
-     * @todo add check that 'git' is executable
      * @return bool
      */
     public static function hasScmInfo()
@@ -34,7 +33,10 @@ public static function hasScmInfo()
      */
     public static function getScmInfo()
     {
-        $dirs = self::getScmDir();
+        $ini = eZINI::instance( 'sysinfo.ini' );
+        $type = $ini->variable('SCMSettings', 'RepoType');
+
+        $dirs = self::getScmDir($type);
         if (!$dirs) {
             return array();
         }
@@ -53,37 +55,92 @@ public static function getScmInfo()
                 continue;
             }
 
-            $revisionInfo = array();
-            exec( "cd $dir && git log -1", $revisionInfo, $retcode );
+            switch( $type )
+            {
+                case 'git':
+                    $out[$name] = static::getRevisionInfoFromGit($dir);
+                    break;
+                case 'file':
+                    $out[$name] = static::getRevisionInfoFromFiles($dir);
+                    break;
+                default:
+                    eZDebug::writeError( "Unsupported scm type '$type'", __METHOD__ );
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * @param string $dir
+     * @return array
+     * @todo add check that 'git' is executable
+     */
+    protected static function getRevisionInfoFromGit( $dir )
+    {
+        $revisionInfo = array();
+        exec( "cd $dir && git log -1", $revisionInfo, $retcode );
 
-            $statusInfo = array();
-            exec( "cd $dir && git status", $statusInfo, $retcode );
+        $statusInfo = array();
+        exec( "cd $dir && git status", $statusInfo, $retcode );
 
-            $tagInfo = array();
-            exec( "cd $dir && git describe", $tagInfo, $retcode );
+        $tagInfo = array();
+        exec( "cd $dir && git describe", $tagInfo, $retcode );
 
-            $out[$name] = array(
-                'revision_info' => $revisionInfo,
-                'status_info' => $statusInfo,
-                'tag_info' => $tagInfo
-            );
+        return array(
+            'revision_info' => $revisionInfo,
+            'status_info' => $statusInfo,
+            'tag_info' => $tagInfo
+        );
+    }
+
+    protected static function getRevisionInfoFromFiles( $dir )
+    {
+        $revisionInfo = array();
+        if ( is_file( "$dir/revision.txt" ) )
+        {
+            $revisionInfo = file( "$dir/revision.txt", FILE_IGNORE_NEW_LINES );
         }
 
-        return $out;
+        $statusInfo = array();
+        if ( is_file( "$dir/status.txt" ) )
+        {
+            $revisionInfo = file( "$dir/status.txt", FILE_IGNORE_NEW_LINES );
+        }
+
+        $tagInfo = array();
+        if ( is_file( "$dir/tag.txt" ) )
+        {
+            $revisionInfo = file( "$dir/tag.txt", FILE_IGNORE_NEW_LINES );
+        }
+
+        return array(
+            'revision_info' => $revisionInfo,
+            'status_info' => $statusInfo,
+            'tag_info' => $tagInfo
+        );
     }
 
     /**
      * @return false|array|string
      */
-    protected static function getScmDir()
+    protected static function getScmDir($type)
     {
         $ini = eZINI::instance( 'sysinfo.ini' );
-        $dir = $ini->variable('SCMSettings', 'RepoDir');
-        if ($dir !== '')
+        $dir = $ini->variable( 'SCMSettings', 'RepoDir' );
+        if ( $dir !== '' )
         {
             return $dir;
         }
 
-        return is_dir( './.git' ) ? './.git' : ( is_dir( '../.git' ) && is_file( '../ezpublish/EzPublishKernel.php' ) ? '../.git' : false );
+        switch($type)
+        {
+            case 'git':
+                return is_dir( './.git' ) ? './.git' : ( is_dir( '../.git' ) && is_file( '../ezpublish/EzPublishKernel.php' ) ? '../.git' : false );
+            case 'file':
+            default:
+                eZDebug::writeError( "Can not find info from scm type '$type' with an empty directory", __METHOD__ );
+                return false;
+        }
     }
 }
diff --git a/classes/inichecker.php b/classes/inichecker.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2010-2016
+ * @copyright (C) G. Giunta 2010-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/phpchecker.php b/classes/phpchecker.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2010-2016
+ * @copyright (C) G. Giunta 2010-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/reportgenerator.php b/classes/reportgenerator.php
@@ -3,7 +3,7 @@
  * A helper class for generating reports
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2012-2016
+ * @copyright (C) G. Giunta 2012-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/reports/ezcontentclassesreport.php b/classes/reports/ezcontentclassesreport.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/reports/ezinireport.php b/classes/reports/ezinireport.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/reports/ezpoliciesreport.php b/classes/reports/ezpoliciesreport.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/reports/ezworkflowsreport.php b/classes/reports/ezworkflowsreport.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/statustests/sysinfotests.php b/classes/statustests/sysinfotests.php
@@ -2,7 +2,7 @@
 /**
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/sysinfomodule.php b/classes/sysinfomodule.php
@@ -3,7 +3,7 @@
  * Class used to help managing in a single place all module/view info
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2010-2016
+ * @copyright (C) G. Giunta 2010-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/sysinfotools.php b/classes/sysinfotools.php
@@ -2,7 +2,7 @@
 /**
  *
  * @author G. Giunta
- * @copyright (C) G. Giunta 2008-2016
+ * @copyright (C) G. Giunta 2008-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/systemchecker.php b/classes/systemchecker.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/tplchecker.php b/classes/tplchecker.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/viewgroups/ezsysinfobaseviewgroup.php b/classes/viewgroups/ezsysinfobaseviewgroup.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/viewgroups/ezsysinfodevelopmentviewgroup.php b/classes/viewgroups/ezsysinfodevelopmentviewgroup.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/viewgroups/ezsysinfoezpublishviewgroup.php b/classes/viewgroups/ezsysinfoezpublishviewgroup.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */
 

diff --git a/classes/viewgroups/ezsysinfoindexviewgroup.php b/classes/viewgroups/ezsysinfoindexviewgroup.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author G. Giunta
- * @copyright (C) G. Giunta 2014-2016
+ * @copyright (C) G. Giunta 2014-2017
  * @license Licensed under GNU General Public License v2.0. See file license.txt
  */