php-serialize 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d3c32a1fe43d8186acdc93c67320994c69ae8d4
-  data.tar.gz: 2fe820e15442213a58e8c084965583155cada091
+SHA256:
+  metadata.gz: c1e2ab051accee52d022349801a297fbaa81c21ea025123291ebccb44cf3a28d
+  data.tar.gz: cceaed0eab97b037777dd37cb2c50f6e98e3d6b0c1a5f3f9f9f9cb9f392a7c5b
 SHA512:
-  metadata.gz: 42a2a80a57cf7c4b57a80f65804172a95407a2d27f5ae9d7daca1a4224ffe3eee926efda691161917639d4959b1870f2e28db9c32add604419855954e1879578
-  data.tar.gz: e656d868b8a3a1d87b8bcb5827021dd31b2fb729539388efab48e8f02938d4ee177046863b9950c7993b15c60a288387ded2b9b2acd9ac2fd3edb6a4ac691024
+  metadata.gz: ac582a23b37c737ecd86ffe611af1a5cb569a96462da61f77932dafd7450a7748dbd7155926008b6dda7ee36ca9ccdcc5844eb5f0ccb72670b65570a7bcac731
+  data.tar.gz: 337d048bc1c69c7ad52553d160d0c591ab9231a4ed6b0bd8f52ae6498e2e1f9d8817b6e3278f5a417e3217b3b548114515f7a059a9e9d7b94e23c86b83d6327c

data/lib/php_serialize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 
 module PHP
@@ -27,7 +29,7 @@ module PHP
 	# array will be assumed to be an associative array, and will be serialized
 	# as a PHP associative array rather than a multidimensional array.
 	def PHP.serialize(var, assoc = false) # {{{
-		s = ''
+		s = String.new
 		case var
 			when Array
 				s << "a:#{var.size}:{"
@@ -52,7 +54,7 @@ module PHP
 
 			when Struct
 				# encode as Object with same name
-				s << "O:#{var.class.to_s.length}:\"#{var.class.to_s.downcase}\":#{var.members.length}:{"
+				s << "O:#{var.class.to_s.bytesize}:\"#{var.class.to_s.downcase}\":#{var.members.length}:{"
 				var.members.each do |member|
 					s << "#{PHP.serialize(member, assoc)}#{PHP.serialize(var[member], assoc)}"
 				end
@@ -61,7 +63,7 @@ module PHP
 			when String, Symbol
 				s << "s:#{var.to_s.bytesize}:\"#{var.to_s}\";"
 
-			when Fixnum # PHP doesn't have bignums
+			when Integer
 				s << "i:#{var};"
 
 			when Float
@@ -77,7 +79,7 @@ module PHP
 				if var.respond_to?(:to_assoc)
 					v = var.to_assoc
 					# encode as Object with same name
-					s << "O:#{var.class.to_s.length}:\"#{var.class.to_s.downcase}\":#{v.length}:{"
+					s << "O:#{var.class.to_s.bytesize}:\"#{var.class.to_s.downcase}\":#{v.length}:{"
 					v.each do |k,v|
 						s << "#{PHP.serialize(k.to_s, assoc)}#{PHP.serialize(v, assoc)}"
 					end
@@ -95,11 +97,11 @@ module PHP
 	#
 	#   string = PHP.serialize_session(mixed var[, bool assoc])
 	def PHP.serialize_session(var, assoc = false) # {{{
-		s = ''
+		s = String.new
 		case var
 		when Hash
 			var.each do |key,value|
-				if key.to_s =~ /\|/
+				if key.to_s.include?('|')
 					raise IndexError, "Top level names may not contain pipes"
 				end
 				s << "#{key}|#{PHP.serialize(value, assoc)}"
@@ -168,7 +170,7 @@ module PHP
 			ret[$1] = PHP.do_unserialize(string, classmap, assoc)
 		end
 
-		ret ? ret : PHP.do_unserialize(string, classmap, assoc)
+		ret || PHP.do_unserialize(string, classmap, assoc)
 	end
 
 	private
@@ -180,9 +182,9 @@ module PHP
 		case type
 			when 'a' # associative array, a:length:{[index][value]...}
 				count = string.read_until('{').to_i
-				val = vals = Array.new
+				val = Array.new
 				count.times do |i|
-					vals << [do_unserialize(string, classmap, assoc), do_unserialize(string, classmap, assoc)]
+					val << [do_unserialize(string, classmap, assoc), do_unserialize(string, classmap, assoc)]
 				end
 				string.read(1) # skip the ending }
 
@@ -190,7 +192,7 @@ module PHP
 				# arrays have all numeric indexes, in order; otherwise we assume a hash
 				array = true
 				i = 0
-				vals.each do |key,value|
+				val.each do |key,_|
 					if key != i # wrong index -> assume hash
 						array = false
 						break
@@ -199,18 +201,9 @@ module PHP
 				end
 
 				if array
-					vals.collect! do |key,value|
-						value
-					end
-				else
-					if assoc
-						val = vals.map {|v| v }
-					else
-						val = Hash.new
-						vals.each do |key,value|
-							val[key] = value
-						end
-					end
+					val.map! {|_,value| value }
+				elsif !assoc
+					val = Hash[val]
 				end
 
 			when 'O' # object, O:length:"class":length:{[attribute][value]...}
@@ -264,7 +257,7 @@ module PHP
 				val = nil
 
 			when 'b' # bool, b:0 or 1
-				val = (string.read(2)[0] == ?1 ? true : false)
+				val = string.read(2)[0] == '1'
 
 			else
 				raise TypeError, "Unable to unserialize type '#{type}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: php-serialize
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Thomas Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,7 +49,7 @@ files:
 - lib/php-serialize.rb
 - lib/php_serialize.rb
 - test/php_serialize_test.rb
-homepage: http://www.aagh.net/projects/ruby-php-serialize
+homepage: https://github.com/jqr/php-serialize
 licenses:
 - MIT
 metadata: {}
@@ -61,15 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby analogs to PHP's serialize() and unserialize() functions