Use match? instead of =~ when MatchData is not used (#34150).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@20168 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue_import.rb b/app/models/issue_import.rb
index 7ab0a3642c36c04e91688953f351e0fa1522d63a..f515eaa5e2cc6491260bf461406ba13f1b552f09 100644 (file)
--- a/app/models/issue_import.rb
+++ b/app/models/issue_import.rb
@@ -179,7 +179,7 @@ class IssueImport < Import
         else
           add_callback(parent_issue_id, 'set_as_parent', item.position)
         end
-      elsif parent_issue_id =~ /\A\d+\z/
+      elsif /\A\d+\z/.match?(parent_issue_id)
         # refers to other row by position
         parent_issue_id = parent_issue_id.to_i
 

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 14b3f0e1973948e61e84bc3110a7e1dbad3abbf6..16e51fd53b9277a8d3c5f7bac481adf411479f8e 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -186,7 +186,7 @@ class Setting < ActiveRecord::Base
     if settings.key?(:mail_from)
       begin
         mail_from = Mail::Address.new(settings[:mail_from])
-        raise unless mail_from.address =~ EmailAddress::EMAIL_REGEXP
+        raise unless EmailAddress::EMAIL_REGEXP.match?(mail_from.address)
       rescue
         messages << [:mail_from, l('activerecord.errors.messages.invalid')]
       end

diff --git a/db/migrate/20120422150750_change_repositories_to_full_sti.rb b/db/migrate/20120422150750_change_repositories_to_full_sti.rb
index 101ecbc1266ed2f0d97120c29b11f4d608733a5f..f97d47cf180f73f13e1024e1ab9e6b4dd1b48334 100644 (file)
--- a/db/migrate/20120422150750_change_repositories_to_full_sti.rb
+++ b/db/migrate/20120422150750_change_repositories_to_full_sti.rb
@@ -3,7 +3,7 @@ class ChangeRepositoriesToFullSti < ActiveRecord::Migration[4.2]
     Repository.connection.
          select_rows("SELECT id, type FROM #{Repository.table_name}").
          each do |repository_id, repository_type|
-      unless repository_type =~ /^Repository::/
+      unless /^Repository::/.match?(repository_type)
         Repository.where(["id = ?", repository_id]).
           update_all(["type = ?", "Repository::#{repository_type}"])
       end

diff --git a/db/migrate/20180923082945_change_sqlite_booleans_to_0_and_1.rb b/db/migrate/20180923082945_change_sqlite_booleans_to_0_and_1.rb
index fb789ae10c32b643c1f753d8844964b62e27e869..769ea7a51a0d6b4398ebe2b6b57a715b7e816680 100644 (file)
--- a/db/migrate/20180923082945_change_sqlite_booleans_to_0_and_1.rb
+++ b/db/migrate/20180923082945_change_sqlite_booleans_to_0_and_1.rb
@@ -23,7 +23,7 @@ class ChangeSqliteBooleansTo0And1 < ActiveRecord::Migration[5.2]
   }
 
   def up
-    if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
+    if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
       COLUMNS.each do |klass, columns|
         columns.each do |column|
           klass.where("#{column} = 't'").update_all(column => 1)
@@ -34,7 +34,7 @@ class ChangeSqliteBooleansTo0And1 < ActiveRecord::Migration[5.2]
   end
 
   def down
-    if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
+    if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
       COLUMNS.each do |klass, columns|
         columns.each do |column|
           klass.where("#{column} = 1").update_all(column => 't')

diff --git a/db/migrate/20180923091603_change_sqlite_booleans_default.rb b/db/migrate/20180923091603_change_sqlite_booleans_default.rb
index 563bf32376216c3a4b15639e5ffed64da016f0c4..e72917b12d96e5843fa37cc6d0c67f47a6369333 100644 (file)
--- a/db/migrate/20180923091603_change_sqlite_booleans_default.rb
+++ b/db/migrate/20180923091603_change_sqlite_booleans_default.rb
@@ -74,7 +74,7 @@ class ChangeSqliteBooleansDefault < ActiveRecord::Migration[5.2]
   }
 
   def up
-    if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
+    if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
       DEFAULTS.each do |table, defaults|
         defaults.each do |column, value|
           # Reset default values for boolean column (t/f => 1/0)
@@ -85,7 +85,7 @@ class ChangeSqliteBooleansDefault < ActiveRecord::Migration[5.2]
   end
 
   def down
-    if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
+    if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
       # Cannot restore default values as t/f
       raise ActiveRecord::IrreversibleMigration
     end

diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index d5a761faa5ae356e94295cbc333a12b123f5ee54..f240284fda3eb32a5ebd524588e164206d65e7f0 100644 (file)
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -137,7 +137,7 @@ module Redmine
             revision = nil
             parsing  = nil
             io.each_line do |line|
-              if line =~ /^----/
+              if /^----/.match?(line)
                 revisions << revision if revision
                 revision = Revision.new(:paths => [], :message => '')
                 parsing = nil
@@ -152,7 +152,7 @@ module Redmine
                   revision.scmid = $1.strip
                 elsif line =~ /^timestamp: (.+)$/
                   revision.time = Time.parse($1).localtime
-                elsif line =~ /^    -----/
+                elsif /^    -----/.match?(line)
                   # partial revisions
                   parsing = nil unless parsing == 'message'
                 elsif line =~ /^(message|added|modified|removed|renamed):/

diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index ae45c43fbb447a942399918f1f1d156d80aa8ff6..6c25a80345866db406f882e3410c68ddf0ce86e4 100644 (file)
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -198,10 +198,10 @@ module Redmine
                   next
                 end
               elsif state == "tags"
-                if /^#{STARTLOG}/ =~ line
+                if /^#{STARTLOG}/.match?(line)
                   commit_log = ""
                   state = "revision"
-                elsif /^#{ENDLOG}/ =~ line
+                elsif /^#{ENDLOG}/.match?(line)
                   state = "head"
                 end
                 next
@@ -232,13 +232,13 @@ module Redmine
                   end
                   commit_log = ""
                   revision   = nil
-                  if /^#{ENDLOG}/ =~ line
+                  if /^#{ENDLOG}/.match?(line)
                     state = "entry_start"
                   end
                   next
                 end
 
-                if /^branches: (.+)$/ =~ line
+                if /^branches: (.+)$/.match?(line)
                   # TODO: version.branch = $1
                 elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
                   revision = $1
@@ -260,7 +260,7 @@ module Redmine
                   #                  version.line_minus = 0
                   #                end
                 else
-                  commit_log += line unless line =~ /^\*\*\* empty log message \*\*\*/
+                  commit_log += line unless /^\*\*\* empty log message \*\*\*/.match?(line)
                 end
               end
             end

diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb
index 92c6e29d0d816ab279e2e78bb5a20d5d0e25add6..b47296b1be65b573574eeebd7f64f7ab92fab9b0 100644 (file)
--- a/lib/redmine/wiki_formatting/textile/redcloth3.rb
+++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb
@@ -636,7 +636,7 @@ class RedCloth3 < String
     end
 
     def lT( text )
-        text =~ /\#$/ ? 'o' : 'u'
+        /\#$/.match?(text) ? 'o' : 'u'
     end
 
     def hard_break( text )
@@ -908,7 +908,7 @@ class RedCloth3 < String
 
     def refs( text )
         @rules.each do |rule_name|
-            method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
+            method( rule_name ).call( text ) if rule_name.to_s.match? /^refs_/
         end
     end
 
@@ -1061,9 +1061,9 @@ class RedCloth3 < String
             text.gsub!( ALLTAG_MATCH ) do |line|
                 ## matches are off if we're between <code>, <pre> etc.
                 if $1
-                    if line =~ OFFTAG_OPEN
+                    if OFFTAG_OPEN.match?(line)
                         codepre += 1
-                    elsif line =~ OFFTAG_CLOSE
+                    elsif OFFTAG_CLOSE.match?(line)
                         codepre -= 1
                         codepre = 0 if codepre < 0
                     end