.editorconfig

@@ -2,11 +2,15 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[.github/**.yml]
+indent_size = 2
+indent_style = space

.env.dist

@@ -3,9 +3,3 @@
 #
 # Copy to `.env` in order to use it.
 #
-
-# APC test are disabled.
-#
-# To enable them in order to provide a fix, set to "on".
-#
-APC_ENABLE_CLI=off

.gitattributes

@@ -0,0 +1,11 @@
+.docker/               export-ignore
+.editorconfig          export-ignore
+.env.dist              export-ignore
+.gitattributes         export-ignore
+.github/               export-ignore
+.gitignore             export-ignore
+.php-cs-fixer.dist.php export-ignore
+docker-compose.yml     export-ignore
+phpstan.neon           export-ignore
+phpunit.xml            export-ignore
+tests/                 export-ignore

.github/workflows/continuous-integration.yml

@@ -1,49 +1,63 @@
 name: "Continuous Integration"
 
 on:
-    push:
-      branches:
-        - master
-    pull_request:
+  push:
+    branches:
+      - master
+  pull_request:
 
 env:
-    fail-fast: true
+  fail-fast: true
 
 jobs:
-    tests:
-        name: "Symfony1 Tests"
-        runs-on: "ubuntu-22.04"
-
-        strategy:
-            matrix:
-                php-version:
-                    - "7.4"
-                    - "8.0"
-                    - "8.1"
-                    - "8.2"
-                memcached-version:
-                    - "1.6"
-
-        services:
-            memcached:
-              image: "memcached:${{ matrix.memcached-version }}"
-
-        steps:
-            - name: "Checkout"
-              uses: "actions/checkout@v3"
-              with:
-                submodules: "true"
-
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
-              with:
-                  php-version: "${{ matrix.php-version }}"
-
-            - name: "Install dependencies with Composer"
-              uses: "ramsey/composer-install@v2"
-
-            - name: "Run Check configuration"
-              run: "php data/bin/check_configuration.php"
-
-            - name: "Run Tests"
-              run: "php data/bin/symfony symfony:test --trace"
+  tests:
+    name: "Symfony1 Tests"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+          - "8.0"
+          - "8.1"
+          - "8.2"
+          - "8.3"
+        memcached-version:
+          - "1.6"
+
+    services:
+      memcached:
+        image: "memcached:${{ matrix.memcached-version }}"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: "true"
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php-version }}"
+          extensions: apcu
+          ini-values: apc.enable_cli=1
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run Check configuration
+        run: php data/bin/check_configuration.php
+
+      - name: Run Tests
+        run: php data/bin/symfony symfony:test --trace

.github/workflows/lint.yml

@@ -0,0 +1,31 @@
+name: "Code Linting"
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  php-cs-fixer:
+    name: 'PHP-CS-Fixer'
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: php-cs-fixer:3.45, cs2pr
+
+      - uses: actions/cache@v3
+        with:
+          path: '.php-cs-fixer.cache'
+          key: ${{ github.repository }}-8.2-phpcsfixer-${{ github.ref_name }}
+          restore-keys: |
+            ${{ github.repository }}-8.2-phpcsfixer-master
+            ${{ github.repository }}-8.2-phpcsfixer-
+
+      - name: Run PHP-CS-Fixer
+        # Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support
+        run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr'

.gitignore

@@ -6,3 +6,4 @@
 lib/plugins/sfDoctrinePlugin/test/functional/fixtures/log/
 /vendor
 /composer.lock
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,29 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->ignoreVCSIgnored(true)
+    ->in(__DIR__.'/lib')
+    ->in(__DIR__.'/data/bin')
+    ->in(__DIR__.'/test')
+    ->append(array(__FILE__))
+    // Exclude PHP classes templates/generators, which are not valid PHP files
+    ->exclude('task/generator/skeleton/')
+    ->exclude('plugins/sfDoctrinePlugin/data/generator/')
+    // Exclude generated files (single files)
+    ->notPath('unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_result.php')
+    ->notPath('unit/config/fixtures/sfFilterConfigHandler/result.php')
+;
+
+$config = new PhpCsFixer\Config();
+$config->setRules(array(
+    '@PhpCsFixer' => true,
+    '@Symfony' => true,
+    'array_syntax' => array(
+        'syntax' => 'long',
+    ),
+))
+    ->setCacheFile('.php-cs-fixer.cache')
+    ->setFinder($finder)
+;
+
+return $config;

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+=======
+xx/xx/xxxx: Version 1.5.16
+--------------------------
+
+
 12/01/2023: Version 1.5.15
 --------------------------
 

README.md

@@ -1,17 +1,17 @@
-[![Build Status](https://secure.travis-ci.org/FriendsOfSymfony1/symfony1.png?branch=master)](http://travis-ci.org/FriendsOfSymfony1/symfony1)
+![Build Status](https://github.com/FriendsOfSymfony1/symfony1/actions/workflows/continuous-integration.yml/badge.svg)
 
 About this version
 ------------------
 
-This is a community driven fork of symfony 1, as official support has been [interrupted in November 2012](http://symfony.com/blog/symfony-1-4-end-of-maintenance-what-does-it-mean).
+This is a community driven fork of symfony 1, as official support has been [interrupted in November 2012](https://symfony.com/blog/symfony-1-4-end-of-maintenance-what-does-it-mean).
 
-**Do not use it for new projects: this version is great to improve existing symfony1 applications, but [Symfony5](http://symfony.com/) is the way to go today.**
+**Do not use it for new projects: this version is great to improve existing symfony1 applications, but [newer Symfony](https://symfony.com/) versions is the way to go today.**
 
 All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.com/FriendsOfSymfony1/symfony1/blob/master/WHATS_NEW.md) file, this include:
 
 - [DIC](https://github.com/FriendsOfSymfony1/symfony1/wiki/ServiceContainer)
 - Composer support
-- PHP 8.2 support
+- PHP 8.3 support
 - performance boost
 - new widgets & validators
 - some tickets fixed from the symfony trac
@@ -34,22 +34,22 @@ It runs on *nix and Windows platforms*.
 Requirements
 ------------
 
-PHP 5.3.4 and up. See prerequisites on http://symfony.com/legacy/doc/getting-started/1_4/en/02-Prerequisites
+PHP 5.3.4 and up. See prerequisites on https://symfony.com/legacy/doc/getting-started/1_4/en/02-Prerequisites
 
 Installation
 ------------
 
-See http://symfony.com/legacy/doc/getting-started/1_4/en/03-Symfony-Installation
+See https://symfony.com/legacy/doc/getting-started/1_4/en/03-Symfony-Installation
 
-Option 1: Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:
+Option 1: Using [Composer](https://getcomposer.org/doc/00-intro.md) as dependency management:
 
     composer require friendsofsymfony1/symfony1 "1.5.*"
     composer install
-    
-Note: On windows, if your project is a few directories down from the drive root, composer can throw an error  relating to ZipArchive::extractTo(), this can be because pathnames are too long. There currently appears to be no proper solution but a workaround is to move your project to the drive root, run the commands from there, where they will run happily, and then move your project back. 
+
+Note: On windows, if your project is a few directories down from the drive root, composer can throw an error  relating to ZipArchive::extractTo(), this can be because pathnames are too long. There currently appears to be no proper solution but a workaround is to move your project to the drive root, run the commands from there, where they will run happily, and then move your project back.
 
 Option 2: Using Git submodules:
-  
+
     git init # your project
     git submodule add https://github.com/FriendsOfSymfony1/symfony1.git lib/vendor/symfony
     git submodule update --init --recursive
@@ -88,7 +88,7 @@ Tests
 Documentation
 -------------
 
-Read the official [symfony1 documentation](http://symfony.com/legacy)
+Read the official [symfony1 documentation](https://symfony.com/legacy)
 
 Contributing
 ------------

data/bin/changelog.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,22 +13,22 @@
  *
  * Usage: php data/bin/changelog.php -r12345:67890 /branches/1.3
  *
- * @package    symfony
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 require_once __DIR__.'/../../lib/task/sfFilesystem.class.php';
 
-if (!isset($argv[1]))
-{
-  echo "You must provide a revision range (-r123:456)\n";
-  exit(1);
+if (!isset($argv[1])) {
+    echo "You must provide a revision range (-r123:456)\n";
+
+    exit(1);
 }
 
-if (!isset($argv[2]))
-{
-  echo "You must provide a repository path (/branches/1.4)\n";
-  exit(1);
+if (!isset($argv[2])) {
+    echo "You must provide a repository path (/branches/1.4)\n";
+
+    exit(1);
 }
 
 $filesystem = new sfFilesystem();
@@ -37,13 +37,12 @@
 $info = new SimpleXMLElement($out);
 
 list($out, $err) = $filesystem->execute(vsprintf('svn log %s --xml %s', array_map('escapeshellarg', array(
-  $argv[1],
-  (string) $info->entry->repository->root.$argv[2],
+    $argv[1],
+    (string) $info->entry->repository->root.$argv[2],
 ))));
 $log = new SimpleXMLElement($out);
 
-foreach ($log->logentry as $logentry)
-{
-  echo sprintf(' * [%d] %s', $logentry['revision'], trim(preg_replace('/\s*\[[\d\., ]+\]\s*/', '', (string) $logentry->msg)));
-  echo PHP_EOL;
+foreach ($log->logentry as $logentry) {
+    echo sprintf(' * [%d] %s', $logentry['revision'], trim(preg_replace('/\s*\[[\d\., ]+\]\s*/', '', (string) $logentry->msg)));
+    echo PHP_EOL;
 }