Merge pull request #47 from markstory/cakephp-45

Upgrade to CakePHP 4.5.0
markstory · Jul 29, 2023 · fb8d36f · fb8d36f
2 parents d92e576 + b273a5c
commit fb8d36f
Show file tree

Hide file tree

Showing 54 changed files with 3,392 additions and 2,866 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -121,11 +121,11 @@ jobs:
       run: |
         # Run suites individually so we abort on first failure
         # a string of timeouts takes a long time to work through.
-        vendor/bin/phpunit tests/Acceptance/LoginTest.php
         vendor/bin/phpunit tests/Acceptance/ProjectsTest.php
         vendor/bin/phpunit tests/Acceptance/TasksTest.php
         vendor/bin/phpunit tests/Acceptance/TodayTest.php
         vendor/bin/phpunit tests/Acceptance/UpcomingTest.php
+        vendor/bin/phpunit tests/Acceptance/LoginTest.php
 
   flutter-test:
     runs-on: ubuntu-22.04

diff --git a/assets/js/app.tsx b/assets/js/app.tsx
@@ -1,3 +1,4 @@
+import 'vite/modulepreload-polyfill';
 import axios from 'axios';
 import {InertiaApp} from '@inertiajs/inertia-react';
 import {render} from 'react-dom';

diff --git a/assets/sass/buttons.scss b/assets/sass/buttons.scss
@@ -13,13 +13,13 @@
 
   border: 1px solid transparent;
   margin-bottom: 0;
-  padding: $space $space * 1.5;
+  padding: $space calc($space * 1.5);
   border-radius: $border-radius;
   height: $button-med-height;
 
   // Space icons away from button text.
   & > svg:first-child {
-    margin-right: $space / 2;
+    margin-right: calc($space / 2);
   }
 
   outline: none;
@@ -161,12 +161,12 @@ button,
 
 .button-global-add {
   position: fixed;
-  bottom: $space * 3.5;
-  right: $space * 3.5;
+  bottom: calc($space * 3.5);
+  right: calc($space * 3.5);
   z-index: $z-modal;
   border-radius: 50%;
-  width: $space * 7;
-  height: $space * 7;
+  width: calc($space * 7);
+  height: calc($space * 7);
 
   > svg:first-child {
     margin: 0;
@@ -220,7 +220,7 @@ button,
   @extend .button-bar;
 
   display: flex;
-  margin: 0 0 0 $space * 2;
+  margin: 0 0 0 calc($space * 2);
   padding: 0;
 }
 // }}}
diff --git a/assets/sass/components/calendarItemList.scss b/assets/sass/components/calendarItemList.scss
@@ -2,7 +2,7 @@
   padding: $space;
   background: var(--color-bg-level1);
   border-radius: $border-radius;
-  margin-bottom: $space * 1.5;
+  margin-bottom: calc($space * 1.5);
 }
 
 .calendar-item {
@@ -22,14 +22,14 @@
     background: var(--calendar-color);
     width: 4px;
     height: 1.2em;
-    margin-right: $space / 2;
+    margin-right: calc($space / 2);
   }
 
   time {
     color: var(--calendar-color);
     font-weight: 500;
     font-variant-numeric: tabular-nums;
-    margin-right: $space / 2;
+    margin-right: calc($space / 2);
   }
 
   a {

diff --git a/assets/sass/components/dnd.scss b/assets/sass/components/dnd.scss
@@ -12,7 +12,7 @@
   cursor: grab;
   height: 30px;
   width: 30px;
-  margin-right: $space / 2;
+  margin-right: calc($space / 2);
   line-height: 1;
   border: none;
   padding: 3px;

diff --git a/assets/sass/components/dropdownMenu.scss b/assets/sass/components/dropdownMenu.scss
@@ -38,7 +38,7 @@
   color: var(--color-foreground);
   border-radius: 0;
   box-shadow: none;
-  padding: $space $space * 1.5;
+  padding: $space calc($space * 1.5);
   text-align: left;
   height: auto;
 
@@ -56,7 +56,7 @@
 .dropdown-item-header {
   line-height: 1.2;
 
-  padding: $space $space * 1.5;
+  padding: $space calc($space * 1.5);
   margin: 0;
 }
 

diff --git a/assets/sass/components/dueOn.scss b/assets/sass/components/dueOn.scss
@@ -3,7 +3,7 @@
   align-items: center;
 
   svg {
-    margin-right: $space / 2;
+    margin-right: calc($space / 2);
   }
 
   &.none {

diff --git a/assets/sass/components/dueOnPicker.scss b/assets/sass/components/dueOnPicker.scss
@@ -2,7 +2,7 @@
   padding-bottom: $space;
 
   svg {
-    margin-right: $space / 2;
+    margin-right: calc($space / 2);
   }
   .today svg {
     color: var(--color-due-today);

diff --git a/assets/sass/components/markdownText.scss b/assets/sass/components/markdownText.scss
@@ -4,6 +4,6 @@
   }
   ul, ol {
     margin-left: 0;
-    padding-left: $space * 2;
+    padding-left: calc($space * 2);
   }
 }
diff --git a/assets/sass/components/profileMenu.scss b/assets/sass/components/profileMenu.scss
@@ -1,5 +1,5 @@
 .profile-menu {
-  margin: 0 0 $space * 3 $space / 2;
+  margin: 0 0 calc($space * 3) calc($space / 2);
 
   .avatar,
   .avatar:hover {

diff --git a/assets/sass/components/projectBadge.scss b/assets/sass/components/projectBadge.scss
@@ -4,5 +4,5 @@
 
   // Nudge icon to the left so that it lines up with
   // any text above it.
-  margin-left: $space / 2 * -1;
+  margin-left: calc($space / 2 * -1);
 }
diff --git a/assets/sass/components/projectFilter.scss b/assets/sass/components/projectFilter.scss
@@ -1,6 +1,6 @@
 .project-filter {
   $item-height: 40px;
-  $icon-gap: $space * 0.75;
+  $icon-gap: calc($space * 0.75);
 
   h3 {
     color: var(--color-low-emphasis);
@@ -18,7 +18,7 @@
     height: $item-height;
     display: flex;
     align-items: center;
-    padding: $space 0 $space $space / 2;
+    padding: $space 0 $space calc($space / 2);
     margin: 0 $space * 2 1px 0;
     text-decoration: none;
     border-radius: $border-radius;
@@ -45,7 +45,7 @@
   }
 
   .dnd-dropper-left-offset {
-    margin-right: $space * 2;
+    margin-right: calc($space * 2);
   }
 
   .project-item {

diff --git a/assets/sass/components/projectItem.scss b/assets/sass/components/projectItem.scss
@@ -4,7 +4,7 @@
   justify-content: space-between;
   align-items: center;
   width: max-content;
-  padding-right: $space / 2;
+  padding-right: calc($space / 2);
   border-radius: $border-radius;
   margin-bottom: 1px;
 
@@ -42,11 +42,11 @@
 
     color: var(--color-fg);
     text-decoration: none;
-    padding-left: $space / 2;
+    padding-left: calc($space / 2);
   }
 
   .counter {
-    margin: 0 $space / 2;
+    margin: 0 calc($space / 2);
   }
 }
 

diff --git a/assets/sass/components/sectionContainer.scss b/assets/sass/components/sectionContainer.scss
@@ -1,5 +1,5 @@
 .section-container {
-  margin-top: $space * 5;
+  margin-top: calc($space * 5);
 
   .controls {
     display: flex;

diff --git a/assets/sass/components/select.scss b/assets/sass/components/select.scss
@@ -41,7 +41,7 @@ div.select-narrow__control {
 }
 div.select-narrow__value-container,
 div.select__value-container {
-  padding: $space / 4 $space / 4 $space / 4 $space;
+  padding: calc($space / 4) calc($space / 4) calc($space / 4) $space;
 }
 
 .select-narrow__value-container > div,

diff --git a/assets/sass/components/smartTaskInput.scss b/assets/sass/components/smartTaskInput.scss
@@ -4,7 +4,7 @@
 .smart-task-input__control {
   .date-mention,
   .project-mention {
-    padding: $space / 2 0;
+    padding: calc($space / 2) 0;
     border-radius: $border-radius;
 
     background: var(--color-menu-hover);
@@ -13,7 +13,7 @@
 
 .smart-task-input__highlighter {
   height: $button-med-height;
-  padding: $space / 4 $space;
+  padding: calc($space / 4) $space;
   line-height: 2;
 }
 .smart-task-input__suggestions {

diff --git a/assets/sass/components/taskGroup.scss b/assets/sass/components/taskGroup.scss
@@ -7,5 +7,5 @@
 
 .task-group + .heading-icon,
 .task-group + .heading-task-group {
-  margin-top: $space * 5;
+  margin-top: calc($space * 5);
 }
diff --git a/assets/sass/components/taskQuickForm.scss b/assets/sass/components/taskQuickForm.scss
@@ -11,7 +11,7 @@
   }
   label {
     font-size: $font-size-normal;
-    margin-bottom: $space / 2;
+    margin-bottom: calc($space / 2);
   }
 
   .attributes {
@@ -55,7 +55,7 @@
     margin-top: $space;
   }
   .task-body textarea {
-    margin-top: $space / 2;
+    margin-top: calc($space / 2);
     width: 100%;
   }
 

diff --git a/assets/sass/components/taskRow.scss b/assets/sass/components/taskRow.scss
@@ -5,7 +5,7 @@
 
   align-items: flex-start;
   padding-top: $space;
-  padding-left: $space / 4;
+  padding-left: calc($space / 4);
   padding-bottom: $space;
   border-bottom: 1px solid var(--color-border-low);
   background: var(--color-bg);
@@ -34,10 +34,10 @@
 
     font-size: $font-size-normal;
     color: var(--color-low-emphasis);
-    margin-top: $space * 0.75;
+    margin-top: calc($space * 0.75);
 
     > * + * {
-      margin-left: $space * 1.5;
+      margin-left: calc($space * 1.5);
     }
   }
 
@@ -51,7 +51,7 @@
     display: flex;
     align-items: center;
     position: absolute;
-    top: $space * 0.75;
+    top: calc($space * 0.75);
     right: 0;
 
     background: var(--color-bg);
@@ -76,7 +76,7 @@
 
   // Pad in so that task actions don't overlap with text.
   .task-row > a {
-    padding-right: $space * 3;
+    padding-right: calc($space * 3);
   }
 }
 

diff --git a/assets/sass/components/taskSubtasks.scss b/assets/sass/components/taskSubtasks.scss
@@ -12,7 +12,7 @@
     justify-content: flex-start;
 
     min-height: 30px;
-    margin-bottom: $space / 2;
+    margin-bottom: calc($space / 2);
 
     input[type=checkbox] {
       margin-right: $space;
@@ -30,15 +30,15 @@
 }
 
 .task-subtasks.is-new {
-  margin-top: $space * 3;
+  margin-top: calc($space * 3);
 }
 
 .subtask-sorter {
   padding: 0;
   margin-left: -12px;
 }
 .subtask-addform {
-  margin-left: ($space * 3) - 2;
+  margin-left: calc(($space * 3) - 2px);
   display: grid;
   grid-template-columns: max(20%, 200px) min-content;
   gap: $space;

diff --git a/assets/sass/components/toggleCheckbox.scss b/assets/sass/components/toggleCheckbox.scss
@@ -1,7 +1,7 @@
 // Toggle buttons convert a checkbox into
 // an on/off switch.
-$toggle-width: $button-narrow-height * 2;
-$toggle-knob-diameter: $button-narrow-height - 8;
+$toggle-width: calc($button-narrow-height * 2);
+$toggle-knob-diameter: calc($button-narrow-height - 8px);
 
 .toggle-checkbox {
   position: relative;
@@ -53,7 +53,7 @@ $toggle-knob-diameter: $button-narrow-height - 8;
   }
   input:checked + .knob {
     background: var(--color-toggle-checked);
-    transform: translateX(($toggle-width / 2) - 1);
+    transform: translateX(calc($toggle-width / 2) - 1);
   }
 }
 

diff --git a/assets/sass/components/tooltip.scss b/assets/sass/components/tooltip.scss
@@ -2,7 +2,7 @@
   background: var(--color-invert-bg);
   color: var(--color-invert-fg);
   border-radius: $border-radius;
-  padding: $space / 2 $space;
+  padding: calc($space / 2) $space;
 
   z-index: $z-modal;
   pointer-events: none;