phpcop 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21740e8e63f9fa63630ee1580dbe6cf00f586ff3
-  data.tar.gz: d6848133f0c897e3345092a37581af74f167eca4
+  metadata.gz: f95f331088725a8f4f3aa1d2f2818e186bf3f201
+  data.tar.gz: c4c67475c387c22635d5425308d408559377206e
 SHA512:
-  metadata.gz: 03f7d41acbff8f04b9fa195984f53f25b8e95db12c46a4b0f61d2f2faf05a96f7205e8680b33f951cc707e5dc25e0c9b2c59d5be82ea4333ca970044531372c5
-  data.tar.gz: 9fd4a1bdbb2d10655fb82f15c10e52e179ba00137763b2ef872c512945cda728b6378db3c948c081719414083224a7a6406ab110fbd110ef13e90661b61fd5d8
+  metadata.gz: fa3ec6b704fee5c9a31553a974cb4332e46fce8f7946c20dfd8775eaf71f1915df69698843548c086a5e01d2b431671d29de72391209249701d6df99cad16317
+  data.tar.gz: e09c7f1199129f2b53623a171f22e5b52a62b48badfacbc2678747b67bc67436406c4b8e382d4a6e94521bfd29d536eb4d6484805586ee3d4d57112d0079515c

data/README.md

@@ -1,6 +1,6 @@
 # Phpcop
 
-Tools for detect error (PSRs)[http://www.php-fig.org/].
+Tools for detect error [PSRs](http://www.php-fig.org/).
 
 ## Installation
 

data/lib/phpcop/cop/ccpm/constants.rb

@@ -10,8 +10,8 @@ module PhpCop
         MSG_ALERT_DESCRIB = 'Class constants MUST be declared in all upper '\
          'case with underscore separators.'
 
-        def initialize(file, line, line_number)
-          super(file, line.to_s, line_number)
+        def initialize(file, path, line, line_number)
+          super(file, path, line, line_number)
           test_line
         end
 
@@ -26,7 +26,7 @@ module PhpCop
           unless name.nil?
             name = name.gsub('const ', '').gsub(' =', '')
             n_constant = name.upcase
-            return_an_error(@file, @line_number, 0) unless n_constant.eql? name
+            return_an_error(MSG_ALERT_DESCRIB) unless n_constant.eql? name
           end
         end
       end

data/lib/phpcop/cop/ccpm/methods.rb

@@ -11,8 +11,8 @@ module PhpCop
       class Methods < Cop
         MSG_ALERT_DESCRIB = 'Name method is not in camelCase().'
 
-        def initialize(file, line, line_number)
-          super(file, line.to_s, line_number)
+        def initialize(file, path, line, line_number)
+          super(file, path, line, line_number)
           test_line
         end
 
@@ -27,7 +27,7 @@ module PhpCop
           name = name.gsub(/\(.*/, '')
           unless name.include?('__')
             name_camel = name.camelize(:lower)
-            return_an_error(@file, @line_number, 0) unless name_camel.eql? name
+            return_an_error(MSG_ALERT_DESCRIB) unless name_camel.eql? name
           end
         end
       end

data/lib/phpcop/cop/cop.rb

@@ -7,25 +7,27 @@ module PhpCop
     class Cop
       attr_reader :errors
       # Display an error 'fichier.ext:line:column'
-      MSG_ALERT_FILE = '%s:%s:%s'
-      MSG_ALERT_DESCRIB = ''
+      MSG_ALERT_FILE = '%s/%s:%s:%s'
 
-      def initialize(file, line, line_number)
+      def initialize(file, path, line, line_number)
         @count_open = 0
         @count_close = 0
         @errors = 0
+        @path = path
         @file = file
-        @line = line
+        @line = line.to_s
         @line_number = line_number
       end
 
       private
 
-      def return_an_error(file, line, column)
+      def return_an_error(message_alert_describ)
         @errors += 1
-        line += 1
-        puts format(MSG_ALERT_FILE, file, line, column)
-        puts MSG_ALERT_DESCRIB
+        puts format('line number : %s', @line_number)
+        @line_number += 1
+        @column = 0
+        puts format(MSG_ALERT_FILE, @path, @file, @line_number, @column)
+        puts message_alert_describ
         puts ''
       end
     end

data/lib/phpcop/cop/files/phpencoding.rb

@@ -8,8 +8,8 @@ module PhpCop
       class PhpEncoding < Cop
         MSG_ALERT_DESCRIB = 'Is not encoding in UTF-8 without BOM.'
 
-        def initialize(file, line, line_number)
-          super(file, line.to_s, line_number)
+        def initialize(file, path, line, line_number)
+          super(file, path, line.to_s, line_number)
           test_line
         end
 
@@ -18,9 +18,7 @@ module PhpCop
         # Parse line and test if line is correctly enconding
         def test_line
           line_encoding = @line
-          unless line_encoding.ascii_only?
-            return_an_error(@file, @line_number, 0)
-          end
+          return_an_error(MSG_ALERT_DESCRIB) unless line_encoding.ascii_only?
         end
 
         # TODO : Return position column to char non ASCII

data/lib/phpcop/cop/files/phptags.rb

@@ -12,15 +12,13 @@ module PhpCop
         TAG_OPEN = ['\<\?php', '\<\?='].freeze
         TAG_CLOSE = ['\?\>'].freeze
 
-        def initialize(file, line = nil, line_number = nil)
-          super(file, line, line_number)
+        def initialize(file, path, line = nil, line_number = nil)
+          super(file, path, line, line_number)
         end
 
         def test_counters
           # Test if tags open is equal to tags close
-          unless @count_open == @count_close
-            return_an_error(@file, @line_number, 0)
-          end
+          return_an_error(MSG_ALERT_DESCRIB) unless @count_open == @count_close
         end
 
         # Parse line and test if line use correctly tags PHP

data/lib/phpcop/runner.rb

@@ -46,31 +46,31 @@ module PhpCop
       line_number = 0
       # Execute all test in file
       f = File.open(format('%s/%s', path, file), 'r')
-      @php_tag = PhpCop::Cop::Files::PhpTags.new(file)
+      @php_tag = PhpCop::Cop::Files::PhpTags.new(file, path)
       while (line = f.gets)
-        parse_file(file, line, line_number)
+        parse_file(file, line, line_number, path)
         line_number += 1
       end
       @php_tag.test_counters
       @count_errors += @php_tag.errors
     end
 
-    def parse_file(file, line, line_number)
+    def parse_file(file, line, line_number, path)
       @rules.each do |value|
-        parse_rule(value, file, line, line_number) if value.enabled
+        parse_rule(value, file, line, line_number, path) if value.enabled
       end
     end
 
-    def parse_rule(rule, file, line, line_number)
+    def parse_rule(rule, file, line, line_number, path)
       case rule.name
       when 'phpTags'
         test_file_php_tags(line, line_number)
       when 'phpEncoding'
-        test_file_php_encoding(file, line, line_number)
+        test_file_php_encoding(path, file, line, line_number)
       when 'methods'
-        test_ccpm_methods(file, line, line_number)
+        test_ccpm_methods(path, file, line, line_number)
       when 'constants'
-        test_ccpm_constants(file, line, line_number)
+        test_ccpm_constants(path, file, line, line_number)
       end
     end
 
@@ -78,18 +78,18 @@ module PhpCop
       @php_tag.test_line(line, line_number)
     end
 
-    def test_file_php_encoding(file, line, line_number)
-      test = PhpCop::Cop::Files::PhpEncoding.new(file, line, line_number)
+    def test_file_php_encoding(path, file, line, line_number)
+      test = PhpCop::Cop::Files::PhpEncoding.new(file, path, line, line_number)
       @count_errors += test.errors
     end
 
-    def test_ccpm_methods(file, line, line_number)
-      test = PhpCop::Cop::CCPM::Methods.new(file, line, line_number)
+    def test_ccpm_methods(path, file, line, line_number)
+      test = PhpCop::Cop::CCPM::Methods.new(file, path, line, line_number)
       @count_errors += test.errors
     end
 
-    def test_ccpm_constants(file, line, line_number)
-      test = PhpCop::Cop::CCPM::Constants.new(file, line, line_number)
+    def test_ccpm_constants(path, file, line, line_number)
+      test = PhpCop::Cop::CCPM::Constants.new(file, path, line, line_number)
       @count_errors += test.errors
     end
   end

data/lib/phpcop/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Phpcop
-  VERSION = '0.5.4'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phpcop
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Jeremy VAILLANT