Merge branch 'master' of github.com:ambionics/phpggc

Author: cfreal

Dockerfile

@@ -1,17 +1,15 @@
 FROM php:8.1-cli-alpine AS builder
 
-RUN apk add python3 py3-pip curl
+RUN apk add python3 py3-rich curl
 
 RUN curl -s https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
 
 RUN alias composer='php /usr/bin/composer'
 
-RUN pip install rich
-
 COPY . /phpggc
 
 WORKDIR /phpggc
 
-RUN chmod +x phpggc && echo "phar.readonly=0" > $PHP_INI_DIR/php.ini
+RUN sed -i '1s|.*|#!/usr/bin/env php|' phpggc && chmod +x phpggc && echo "phar.readonly=0" > $PHP_INI_DIR/php.ini
 
 ENTRYPOINT ["/phpggc/phpggc"]

lib/PHPGGC.php

@@ -431,11 +431,11 @@ protected function process_serialized($gc, $serialized)
                     $serialized = base64_encode($serialized);
                     break;
                 case 'url':
-                    $serialized = urlencode($serialized);
+                    $serialized = rawurlencode($serialized);
                     break;
                 case 'soft':
                     $keys = str_split("%\x00\n\r\t+; ");
-                    $values = array_map('urlencode', $keys);
+                    $values = array_map('rawurlencode', $keys);
                     $serialized = str_replace($keys, $values, $serialized);
                     break;
                 case 'json':