I've seen different definitions and am wondering what is the modern convention.
'$\mathcal{M}\vDash\phi(x)$'
Def. 1: $\mathcal{M}$ thinks $\phi(x)$ is true on some interpretation.
Def. 2: $\mathcal{M}$ thinks $\phi(x)$ is true on all interpretations.
'$\phi(x)\vDash\psi(x)$'
Def. 1: For every structure $\mathcal{M}$ and every interpretation $s$, if $\mathcal{M}\vDash\phi(x)[s]$, then $\mathcal{M}\vDash\psi(x)[s]$.
Def. 2: The same as $\forall x\phi(x)\vDash\forall x\psi(x)$ i.e. the formulas are understood as their universal closures.