File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 4242 run : echo "::set-output name=date::$(date +'%Y-%m')"
4343
4444 - name : Cache composer dependencies
45- uses : actions/cache@v1
45+ uses : actions/cache@v4
4646 with :
4747 path : ${{ steps.composer-cache.outputs.dir }}
4848 key : ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
Original file line number Diff line number Diff line change @@ -252,8 +252,8 @@ protected function resolveExtends()
252252 if (!$ parentConfig ) {
253253 return $ config ;
254254 }
255- $ config ['files ' ] = array_merge ($ parentConfig ['files ' ], $ config ['files ' ]);
256- $ config ['filters ' ] = array_merge ($ parentConfig ['filters ' ], $ config ['filters ' ]);
255+ $ config ['files ' ] = array_unique ( array_merge ($ parentConfig ['files ' ], $ config ['files ' ]) );
256+ $ config ['filters ' ] = array_unique ( array_merge ($ parentConfig ['filters ' ], $ config ['filters ' ]) );
257257 $ config ['theme ' ] = $ parentConfig ['theme ' ] || $ config ['theme ' ];
258258 return $ config ;
259259 };
You can’t perform that action at this time.
0 commit comments