Merge branch 'main' into bidi-sanitize

Author: mpivchev

.github/workflows/xcode.yml

@@ -14,11 +14,11 @@ on:
       - develop
 
 env:
-  DESTINATION_IOS: platform=iOS Simulator,name=iPhone 16,OS=18.1
+  DESTINATION_IOS: platform=iOS Simulator,name=iPhone 16,OS=18.5
   DESTINATION_MACOS: platform=macOS,arch=x86_64
   SCHEME: NextcloudKit
-  SERVER_BRANCH: stable28
-  PHP_VERSION: 8.2
+  SERVER_BRANCH: stable30
+  PHP_VERSION: 8.3
 
 jobs:
   build-and-test:
@@ -60,32 +60,12 @@ jobs:
         ./server/occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
         ./server/occ background:cron
         PHP_CLI_SERVER_WORKERS=5 php -S localhost:8080 -t server/ &
-#    - name: Setup Bundler and Install Gems
-#      run: |
-#        gem install bundler
-#        bundle install
-#        bundle update
-#    - name: Install docker
-#      run: |
-#        # Workaround for https://github.com/actions/runner-images/issues/8104
-#        brew remove --ignore-dependencies qemu
-#        curl -o ./qemu.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/dc0669eca9479e9eeb495397ba3a7480aaa45c2e/Formula/qemu.rb
-#        brew install ./qemu.rb
-#
-#        brew install docker
-#        colima start
-#    - name: Create docker test server and export enviroment variables
-#      run: |
-#        source ./create-docker-test-server.sh
-#        if [ ! -f ".env-vars" ]; then
-#            touch .env-vars
-#            echo "export TEST_SERVER_URL=$TEST_SERVER_URL" >> .env-vars
-#            echo "export TEST_USER=$TEST_USER" >> .env-vars
-#            echo "export TEST_APP_PASSWORD=$TEST_APP_PASSWORD" >> .env-vars
-#        fi
-#    - name: Generate EnvVars file
-#      run: |
-#        ./generate-env-vars.sh
+
+    - name: Setup Xcode
+      uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
+
     - name: Build & Test NextcloudKit
       run: |
         set -o pipefail && xcodebuild test -scheme "$SCHEME" \

.swiftlint.yml

@@ -11,7 +11,7 @@ empty_count:
 
 line_length:
   warning: 400
-  error: 400
+  error: 450
 
 function_body_length:
    warning: 200

Sourcery/EnvVars.stencil

@@ -108,35 +108,45 @@ open class NextcloudKit {
         nkCommonInstance.nksessions.append(nkSession)
     }
 
+    /// Updates an existing `NKSession` stored in the synchronized array.
+    ///
+    /// This method looks up the session by its `account` identifier, applies any non-nil
+    /// parameters to mutate the session, and then replaces the stored value using
+    /// `SynchronizedNKSessionArray.replace(account:with:)`.
+    ///
+    /// - Parameters:
+    ///   - account: The account identifier used to locate the session to update.
+    ///   - urlBase: An optional new base URL for the session.
+    ///   - user: An optional new username for the session.
+    ///   - userId: An optional new user identifier for the session.
+    ///   - password: An optional new password or token for the session.
+    ///   - userAgent: An optional new User-Agent string for the session.
     public func updateSession(account: String,
                               urlBase: String? = nil,
                               user: String? = nil,
                               userId: String? = nil,
                               password: String? = nil,
-                              userAgent: String? = nil,
-                              replaceWithAccount: String? = nil) {
-        guard var nkSession = nkCommonInstance.nksessions.session(forAccount: account) else {
+                              userAgent: String? = nil) {
+        guard var newSession = nkCommonInstance.nksessions.session(forAccount: account) else {
             return
         }
 
         if let urlBase {
-            nkSession.urlBase = urlBase
+            newSession.urlBase = urlBase
         }
         if let user {
-            nkSession.user = user
+            newSession.user = user
         }
         if let userId {
-            nkSession.userId = userId
+            newSession.userId = userId
         }
         if let password {
-            nkSession.password = password
+            newSession.password = password
         }
         if let userAgent {
-            nkSession.userAgent = userAgent
-        }
-        if let replaceWithAccount {
-            nkSession.account = replaceWithAccount
+            newSession.userAgent = userAgent
         }
+        nkCommonInstance.nksessions.replace(account: account, with: newSession)
     }
 
     public func deleteCookieStorageForAccount(_ account: String) {

Sourcery/bin/sourcery

@@ -75,6 +75,23 @@ public final class SynchronizedNKSessionArray: @unchecked Sendable {
         }
     }
 
+    /// Replaces the first stored session that matches the given account identifier with a new session.
+    ///
+    /// This method performs the replacement in a thread-safe manner using a barrier write
+    /// on the internal concurrent queue. If no session with the specified account is found,
+    /// the array remains unchanged.
+    ///
+    /// - Parameters:
+    ///   - account: The account identifier of the session to replace.
+    ///   - newSession: The `NKSession` instance that will replace the existing one.
+    public func replace(account: String, with newSession: NKSession) {
+        queue.async(flags: .barrier) {
+            if let idx = self.array.firstIndex(where: { $0.account == account }) {
+                self.array[idx] = newSession
+            }
+        }
+    }
+
     // MARK: - Write Operations
 
     /// Appends a new session to the array.