Merge branch 'feature/ADVAPP-2692' of github.com:canyongbs/advisingapp into feature/ADVAPP-2692

monali4-canyon · monali4-canyon · commit a2006d60d2da · 2026-06-05T18:44:48.000+05:30
diff --git a/.cleanup-tasks/2026_06_02_media_created_by_feature.md b/.cleanup-tasks/2026_06_02_media_created_by_feature.md
@@ -9,14 +9,12 @@ created: 2026-06-02
 
 ## Temporary Migrations
 
-
-
 ## Additional Cleanup
 
 - In `database/migrations/2026_06_02_214123_add_created_by_to_media_table.php`:
-  1. Remove the `MediaCreatedByFeature::activate()` call from the `up()` method
-  2. Remove the `MediaCreatedByFeature::deactivate()` call from the `down()` method
-  3. Remove the `use App\Features\MediaCreatedByFeature;` import
+    1. Remove the `MediaCreatedByFeature::activate()` call from the `up()` method
+    2. Remove the `MediaCreatedByFeature::deactivate()` call from the `down()` method
+    3. Remove the `use App\Features\MediaCreatedByFeature;` import
 
 - In `app/Models/Media.php`: in `getCreatedByNameAttribute()` and `getCreatedBySubLabelAttribute()`, remove the `! MediaCreatedByFeature::active() ||` guard conditions — the methods should always resolve the creator. Remove the `use App\Features\MediaCreatedByFeature;` import.
 
diff --git a/app/Features/MediaCreatedByFeature.php b/app/Features/MediaCreatedByFeature.php
@@ -17,7 +17,7 @@
       in the software, and you may not remove or obscure any functionality in the
       software that is protected by the license key.
     - You may not alter, remove, or obscure any licensing, copyright, or other notices
-      of the licensor in the software. Any use of the licensor's trademarks is subject
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
       to applicable law.
     - Canyon GBS Inc. respects the intellectual property rights of others and expects the
       same in return. Canyon GBS® and Advising App® are registered trademarks of
diff --git a/app/Models/Media.php b/app/Models/Media.php
@@ -17,7 +17,7 @@
       in the software, and you may not remove or obscure any functionality in the
       software that is protected by the license key.
     - You may not alter, remove, or obscure any licensing, copyright, or other notices
-      of the licensor in the software. Any use of the licensor's trademarks is subject
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
       to applicable law.
     - Canyon GBS Inc. respects the intellectual property rights of others and expects the
       same in return. Canyon GBS® and Advising App® are registered trademarks of
diff --git a/app/Observers/MediaObserver.php b/app/Observers/MediaObserver.php
@@ -17,7 +17,7 @@
       in the software, and you may not remove or obscure any functionality in the
       software that is protected by the license key.
     - You may not alter, remove, or obscure any licensing, copyright, or other notices
-      of the licensor in the software. Any use of the licensor's trademarks is subject
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
       to applicable law.
     - Canyon GBS Inc. respects the intellectual property rights of others and expects the
       same in return. Canyon GBS® and Advising App® are registered trademarks of
diff --git a/database/migrations/2026_06_02_214123_add_created_by_to_media_table.php b/database/migrations/2026_06_02_214123_add_created_by_to_media_table.php
@@ -17,7 +17,7 @@
       in the software, and you may not remove or obscure any functionality in the
       software that is protected by the license key.
     - You may not alter, remove, or obscure any licensing, copyright, or other notices
-      of the licensor in the software. Any use of the licensor's trademarks is subject
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
       to applicable law.
     - Canyon GBS Inc. respects the intellectual property rights of others and expects the
       same in return. Canyon GBS® and Advising App® are registered trademarks of
diff --git a/rector-rules/AddInteractsWithMediaUseTagRector.php b/rector-rules/AddInteractsWithMediaUseTagRector.php
@@ -17,7 +17,7 @@
       in the software, and you may not remove or obscure any functionality in the
       software that is protected by the license key.
     - You may not alter, remove, or obscure any licensing, copyright, or other notices
-      of the licensor in the software. Any use of the licensor's trademarks is subject
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
       to applicable law.
     - Canyon GBS Inc. respects the intellectual property rights of others and expects the
       same in return. Canyon GBS® and Advising App® are registered trademarks of
diff --git a/tests/Tenant/Unit/MediaObserverTest.php b/tests/Tenant/Unit/MediaObserverTest.php
@@ -17,7 +17,7 @@
       in the software, and you may not remove or obscure any functionality in the
       software that is protected by the license key.
     - You may not alter, remove, or obscure any licensing, copyright, or other notices
-      of the licensor in the software. Any use of the licensor's trademarks is subject
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
       to applicable law.
     - Canyon GBS Inc. respects the intellectual property rights of others and expects the
       same in return. Canyon GBS® and Advising App® are registered trademarks of
