Merge branch 'master' of https://github.com/docusign/code-examples-ph…

…p-private

.github/workflows/php.yml

@@ -11,12 +11,16 @@ permissions:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Set up PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.2'
+
     - name: Cache Composer packages
       id: composer-cache
       uses: actions/cache@v3
@@ -39,4 +43,4 @@ jobs:
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
           SIGNER_EMAIL: ${{ secrets.SIGNER_EMAIL }}
           SIGNER_NAME: ${{ secrets.SIGNER_NAME }}
-      run: composer run-script test
+      run: composer run-script test

Dockerfile

@@ -3,16 +3,16 @@ FROM composer:2 as composer_stage
 RUN rm -rf /var/www && mkdir -p /var/www/html
 WORKDIR /var/www/html
 
-
-FROM php:8.1.6RC1-fpm-alpine3.15
+FROM php:8.2-fpm-alpine
 
 # Install dev dependencies
 RUN apk add --no-cache --virtual .build-deps \
     $PHPIZE_DEPS \
     curl-dev \
     imagemagick-dev \
     libtool \
-    libxml2-dev
+    libxml2-dev \
+    linux-headers # Add linux-headers here
 
 # Install production dependencies
 RUN apk add --no-cache \
@@ -36,15 +36,15 @@ RUN pecl install \
     imagick \
     xdebug
 
-# We currently can't natively pull iconv with PHP8, see: https://github.com/docker-library/php/issues/240#issuecomment-876464325
+# Workaround for iconv with PHP8
 RUN apk add gnu-libiconv=1.15-r3 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ --allow-untrusted
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
 
-# Install and enable php extensions
+# Install and enable PHP extensions
 RUN docker-php-ext-enable \
     imagick \
     xdebug
-RUN docker-php-ext-configure zip 
+RUN docker-php-ext-configure zip
 RUN docker-php-ext-install \
     curl \
     pdo \
@@ -53,16 +53,15 @@ RUN docker-php-ext-install \
     xml \
     gd \
     zip \
-    bcmath 
+    bcmath
 
 WORKDIR /var/www/html
 COPY src src/
 COPY --from=composer_stage /usr/bin/composer /usr/bin/composer
 COPY composer.json /var/www/html/
-# This are production settings, I'm running with 'no-dev', adjust accordingly 
-# if you need it  
-RUN composer install
+# Install composer dependencies
+RUN composer install --no-dev --optimize-autoloader
 
 CMD ["php-fpm"]
 
-EXPOSE 9000
+EXPOSE 9000

Quick_ACG/composer.json

@@ -1,16 +1,16 @@
 {
-    "autoload": {
-        "psr-4": {"DocuSign\\": "../src/",
-                  "QuickACG\\": "src/"
-                 }
-    },
-
-    "require": {
-        "docusign/esign-client": "^8.0.0",
-        "twig/twig": "^3.11.0",
-        "league/oauth2-client": "^2.7.0",
-        "ext-json": "*",
-        "guzzlehttp/guzzle": "7.9.2",
-        "mashape/unirest-php": "3.0.4"
+  "autoload": {
+    "psr-4": {
+      "DocuSign\\": "../src/",
+      "QuickACG\\": "src/"
     }
+  },
+  "require": {
+    "docusign/esign-client": "^8.0.0",
+    "twig/twig": "^3.14.0",
+    "league/oauth2-client": "^2.7.0",
+    "ext-json": "*",
+    "guzzlehttp/guzzle": "7.9.2",
+    "mashape/unirest-php": "3.0.4"
+  }
 }